Skip to content
Find file Blame History Permalink
  • Sofia Papagiannaki's avatar
    Merge branch 'feature-change-astakos-commands' into feature-quotas · 93d03b12
    Sofia Papagiannaki authored 
    Conflicts:
	snf-astakos-app/astakos/im/management/commands/resource-list.py
	snf-astakos-app/astakos/im/management/commands/service-list.py
	snf-astakos-app/astakos/im/management/commands/service-modify.py
	snf-astakos-app/astakos/im/management/commands/user-modify.py
	snf-astakos-app/astakos/im/management/commands/user-set-initial-quota.py
	snf-astakos-app/astakos/im/management/commands/user-show.py
    93d03b12