Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ... Conflicts: synapse/rest/client/v1/login.py		2015-08-20 16:25:40 +01:00
..
api	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
app	…
appservice	…
config	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
crypto	…
events	…
federation	…
handlers	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
http	…
metrics	…
push	…
rest	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
storage	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
streams	…
util	…
__init__.py	…
notifier.py	…
python_dependencies.py	…
server.py	…
state.py	…
types.py	…