« Previous | Next » 

Revision 5aa83766

ID5aa83766797bdc92fff381397049fcdbe82c568c

Added by Kostas Papadimitriou about 8 years ago

Merge branch 'feature-branding' into develop

Conflicts:
snf-astakos-app/astakos/im/templates/im/account_pending_moderation_notification.txt
snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted