1. 27 Sep, 2012 2 commits
    • Sofia Papagiannaki's avatar
      Fix group_list · f71ac95f
      Sofia Papagiannaki authored
      f71ac95f
    • Sofia Papagiannaki's avatar
      Merge remote-tracking branch 'origin' into dev · a339f0e1
      Sofia Papagiannaki authored
      Conflicts:
      	snf-astakos-app/Changelog
      	snf-astakos-app/README
      	snf-astakos-app/astakos/im/forms.py
      	snf-astakos-app/astakos/im/functions.py
      	snf-astakos-app/astakos/im/settings.py
      	snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
      	snf-astakos-app/astakos/im/static/im/css/modules.css
      	snf-astakos-app/astakos/im/static/im/js/common.js
      	snf-astakos-app/astakos/im/templates/im/base.html
      	snf-astakos-app/astakos/im/views.py
      	snf-astakos-app/conf/20-snf-astakos-app-settings.conf
      a339f0e1
  2. 25 Sep, 2012 5 commits
  3. 21 Sep, 2012 12 commits
  4. 20 Sep, 2012 10 commits
  5. 19 Sep, 2012 1 commit
  6. 18 Sep, 2012 7 commits
  7. 17 Sep, 2012 3 commits