Revision 036da2d2
| ID | 036da2d2a4ccbefd79d79282d2920c52eb2c3435 |
Merge branch 'master' of https://code.grnet.gr/git/synnefo into auth-mechanism
Conflicts:
settings.py.dist
Files
- added
- modified
- copied
- renamed
- deleted
| ID | 036da2d2a4ccbefd79d79282d2920c52eb2c3435 |
Added by Georgios Gousios about 13 years ago
Merge branch 'master' of https://code.grnet.gr/git/synnefo into auth-mechanism
Conflicts:
settings.py.dist