2 Commits (4c7da89219894ed565992a4209a23ddcbfa42a33)

Author	SHA1	Message	Date
Erik Johnston	b50ea730b1	Merge branch 'develop' of github.com:matrix-org/synapse into develop ... Conflicts: synapse/http/server.py synapse/http/content_repository.py	2014-09-03 12:01:14 +01:00
Mark Haines	bf10cf5f1a	move contentrepo class to it's own file	2014-09-03 11:10:44 +01:00