Revision 1cdbfe52
| ID | 1cdbfe5264b60b9c91d45276b56ed49938d8cdf3 |
Merge branch 'master' into ui-0.8
Conflicts:
snf-app/synnefo/ui/static/snf/js/ui/web/ui_vms_base_view.js
snf-docs/asterias-upgrade.rst
Files
- added
- modified
- copied
- renamed
- deleted
| ID | 1cdbfe5264b60b9c91d45276b56ed49938d8cdf3 |
Added by Kostas Papadimitriou about 11 years ago
Merge branch 'master' into ui-0.8
Conflicts:
snf-app/synnefo/ui/static/snf/js/ui/web/ui_vms_base_view.js
snf-docs/asterias-upgrade.rst