Commit 5a6f91fc authored by Antony Chazapis's avatar Antony Chazapis
Browse files

Merge branch 'master' of https://code.grnet.gr/git/astakos

Conflicts:
	astakos/im/util.py
parents ca34523e e5396d5e
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment