« Previous | Next » 

Revision 485c713e

ID485c713e0ff9565ef58d6e1506f54f5dcf37b8ba
Parent 5dbfd71e, ee210d1d
Child 1876378f

Added by Sofia Papagiannaki over 9 years ago

Merge remote-tracking branch 'origin' into future

Conflicts:
snf-astakos-app/README
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/static/im/js/forms.js
snf-astakos-app/astakos/im/target/redirect.py
snf-astakos-app/astakos/im/target/shibboleth.py
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/util.py
snf-astakos-app/astakos/im/views.py
snf-astakos-app/conf/20-snf-astakos-app-settings.conf

Files

  • added
  • modified
  • copied
  • renamed
  • deleted