Revision b530ab38
ID | b530ab38405bc9a483abc1662c3e972f6578efe7 |
Merge branch 'ui-0.11' into nodeapi
Conflicts:
snf-cyclades-app/synnefo/app_settings/__init__.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | b530ab38405bc9a483abc1662c3e972f6578efe7 |
Added by Kostas Papadimitriou almost 11 years ago
Merge branch 'ui-0.11' into nodeapi
Conflicts:
snf-cyclades-app/synnefo/app_settings/__init__.py