Merge branch 'hotfix-0.14.3' into develop
Conflicts: Changelog snf-astakos-app/astakos/im/messages.py snf-pithos-app/pithos/api/manage_accounts/__init__.py snf-pithos-app/pithos/api/management/commands/reconcile-resources-pithos.py snf-pithos-app/pithos/api/settings.py...
astakos: Fix arg passing in messages
astakos: Different image on login page
A different image is shown in the login page when the mainlogin method is 'local' and its form is already expanded.
astakos: Correct plural in 1 pending membership
astakos: remove URL-distorting full stops in emails
astakos: Fix typo in api_access template
astakos: Verbal changes to Dashboard API access page
astakos: Sent emails appearance fix.
Removing extra lines and spaces from email templates.Decode contact email special characters.
astakos: Add "sign in" link to Sign up page
astakos: Alter projects intro message (revised)
View revisions
Also available in: Atom