1. 16 Mar, 2012 1 commit
    • Sofia Papagiannaki's avatar
      Merge branch 'master' into aquarium · 067961d3
      Sofia Papagiannaki authored
      Conflicts:
      	snf-astakos-app/Changelog
      	snf-astakos-app/README
      	snf-astakos-app/astakos/im/api.py
      	snf-astakos-app/astakos/im/backends.py
      	snf-astakos-app/astakos/im/context_processors.py
      	snf-astakos-app/astakos/im/functions.py
      	snf-astakos-app/astakos/im/management/commands/sendactivation.py
      	snf-astakos-app/astakos/im/models.py
      	snf-astakos-app/astakos/im/settings.py
      	snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
      	snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.less
      	snf-astakos-app/astakos/im/static/im/css/styles.css
      	snf-astakos-app/astakos/im/static/im/css/styles.less
      	snf-astakos-app/astakos/im/templates/im/login.html
      	snf-astakos-app/astakos/im/views.py
      067961d3
  2. 15 Mar, 2012 8 commits
  3. 14 Mar, 2012 4 commits
  4. 13 Mar, 2012 7 commits
  5. 12 Mar, 2012 5 commits
  6. 09 Mar, 2012 1 commit
  7. 08 Mar, 2012 9 commits
  8. 07 Mar, 2012 5 commits