Revision 980cd4c2
| ID | 980cd4c2f4cd41c75d7cd828e618aa1b832dc0f7 |
Merge branch 'master' of https://code.grnet.gr/git/synnefo into api-current
Conflicts:
snf-cyclades-app/setup.py
snf-webproject/setup.py
Files
- added
- modified
- copied
- renamed
- deleted