1. 09 Nov, 2012 1 commit
  2. 08 Nov, 2012 9 commits
  3. 07 Nov, 2012 4 commits
  4. 06 Nov, 2012 2 commits
  5. 05 Nov, 2012 8 commits
  6. 02 Nov, 2012 5 commits
  7. 28 Oct, 2012 2 commits
  8. 25 Oct, 2012 6 commits
  9. 23 Oct, 2012 2 commits
  10. 22 Oct, 2012 1 commit
    • Sofia Papagiannaki's avatar
      Merge remote-tracking branch 'origin' into future · 29a02040
      Sofia Papagiannaki authored
      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
      29a02040