Revision 0bc9e367
ID | 0bc9e3679101c6af631a20b90773c21012c9da57 |
Merge branch 'api-current' into helpdesk-gui
Conflicts:
settings.py.dist
Files
- added
- modified
- copied
- renamed
- deleted
ID | 0bc9e3679101c6af631a20b90773c21012c9da57 |
Added by Giorgos Gousios almost 13 years ago
Merge branch 'api-current' into helpdesk-gui
Conflicts:
settings.py.dist