« Previous | Next » 

Revision 2e90e3ec

ID2e90e3ece36488e77b6770bbaecc5dafb5517b6e
Parent d2633501, 421aeae8
Child e2581777

Added by Kostas Papadimitriou over 9 years ago

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
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted