Revision 5aeacecf
ID | 5aeacecf52087a08a26883559efa185341fa42d7 |
Merge branch 'master' of https://code.grnet.gr/git/synnefo into plankton
Conflicts:
snf-app/synnefo/settings/common/apps.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 5aeacecf52087a08a26883559efa185341fa42d7 |
Added by Giorgos Verigakis over 12 years ago
Merge branch 'master' of https://code.grnet.gr/git/synnefo into plankton
Conflicts:
snf-app/synnefo/settings/common/apps.py