Revision 117ca598
ID | 117ca598ba23ab400b84d2e46251873aa427bafc |
Merge branch 'feature-json-output' into develop
Conflicts:
Changelog
kamaki/cli/commands/image.py
Also, take care of pep8 issues
Files
- added
- modified
- copied
- renamed
- deleted
ID | 117ca598ba23ab400b84d2e46251873aa427bafc |
Added by Stavros Sachtouris almost 11 years ago
Merge branch 'feature-json-output' into develop
Conflicts:
Changelog
kamaki/cli/commands/image.py
Also, take care of pep8 issues