Revision 65bf328b
ID | 65bf328b4169cf6db4ccc2b2fbec5ff4d7f87a6e |
Merge branch 'invitations' into reconcilation
Conflicts:
logic/dispatcher_callbacks.py
settings.py.dist
Files
- added
- modified
- copied
- renamed
- deleted
ID | 65bf328b4169cf6db4ccc2b2fbec5ff4d7f87a6e |
Added by Giorgos Gousios about 13 years ago
Merge branch 'invitations' into reconcilation
Conflicts:
logic/dispatcher_callbacks.py
settings.py.dist