Revision bd7fe7c1
ID | bd7fe7c18f387407a335541af7e956f512d5462b |
Merge branch 'feature-change-astakos-commands' into feature-quotas
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
Files
- added
- modified
- copied
- renamed
- deleted