Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor

Conflicts:
	setup.py
This commit is contained in:
Erik Johnston 2014-12-11 17:48:48 +00:00
commit cde840a82c
27 changed files with 1422 additions and 20 deletions

View file

@ -42,6 +42,7 @@ setup(
"daemonize",
"py-bcrypt",
"frozendict>=0.4",
"pillow",
],
dependency_links=[
"https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2",