Revision 5a6f91fc
ID | 5a6f91fcd4c0baf590996f80f9c82607d5959c6b |
Merge branch 'master' of https://code.grnet.gr/git/astakos
Conflicts:
astakos/im/util.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 5a6f91fcd4c0baf590996f80f9c82607d5959c6b |
Added by Antony Chazapis about 12 years ago
Merge branch 'master' of https://code.grnet.gr/git/astakos
Conflicts:
astakos/im/util.py