« Previous | Next » 

Revision 133b2afe

ID133b2afe6c5e3ce29f98503930e76450aa11087c
Parent bde71886, c9015cf6
Child 52343ac8

Added by Olga Brani over 8 years ago

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
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/astakosuserquota_list.html
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted