Revision 10854362
ID | 10854362ff916de885d2a6f499223b165108a2f9 |
Merge branch 'master' of https://code.grnet.gr/git/pithos into invitations
Conflicts:
pithos/im/models.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 10854362ff916de885d2a6f499223b165108a2f9 |
Added by Giorgos Verigakis over 12 years ago
Merge branch 'master' of https://code.grnet.gr/git/pithos into invitations
Conflicts:
pithos/im/models.py