Skip to content
  • Kostas Papadimitriou's avatar
    Merge branch 'master' into grnetstyles · 4b100dbb
    Kostas Papadimitriou authored
    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
    4b100dbb