change word `consumed` in `used`
change IM_MEDIA_URL to IM_STATIC_URL
Refs: #1993
change settings namespace
Refs: #1997
Merge branch 'grnetstyles'
change email templates
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
Fixed admin base template to use old bootstrap styles
Remove accepted flag (change to consumed) and invitation login target.
fix admin logout
Set cookie and delete cookie and other minor changes.
View revisions
Also available in: Atom