« Previous | Next » 

Revision 4b100dbb

ID4b100dbb47f28e9713ca216b769365176d746c32

Added by Kostas Papadimitriou over 12 years ago

Merge branch 'master' into grnetstyles

Conflicts:
astakos/im/context_processors.py
astakos/im/templates/account_base.html
astakos/im/templates/invitations.html
astakos/im/templates/registration/password_change_form.html
astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted