« Previous | Next » 

Revision 8aeeaf4c

ID8aeeaf4c2dd4d1c9dac77f69d7ff47e9c89dca16

Added by root about 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