« Previous | Next » 

Revision 6fd93cc1

ID6fd93cc193ab5099a6d6920310f46e79ce131a67

Added by Olga Brani almost 9 years ago

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/templates/im/resource_usage.html

Files

  • added
  • modified
  • copied
  • renamed
  • deleted