Remove conflicting migrations
Merge remote-tracking branch 'origin/devel-0.13' into multipleauthmethods
Merge branch 'devel-0.13' into multipleauthmethods
Conflicts: snf-astakos-app/astakos/im/context_processors.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/models.py snf-astakos-app/astakos/im/target/local.py snf-astakos-app/astakos/im/target/shibboleth.py...
add token to quotaholder client
also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings
Allow multiple login methods per account
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Change commissioning imports
Restore im/admin_notification.txt
Comment our LDAPBackend
Add missing import
View revisions
Also available in: Atom