Erik Johnston 8a59915d7d Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop		2015-02-16 09:47:22 +00:00
..
api	…
app	Merge pull request #50 from matrix-org/application-services	2015-02-13 15:06:14 +00:00
appservice	…
config	…
crypto	…
events	…
federation	Fix logging	2015-02-12 19:29:43 +00:00
handlers	Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop	2015-02-16 09:47:22 +00:00
http	Merge pull request #50 from matrix-org/application-services	2015-02-13 15:06:14 +00:00
push	Update pushers by app id and pushkey, not user id and pushkey	2015-02-13 16:16:16 +00:00
rest	Merge pull request #50 from matrix-org/application-services	2015-02-13 15:06:14 +00:00
storage	Merge branch 'hotfixes-0.7.0e' into develop	2015-02-13 16:18:34 +00:00
streams	…
util	…
__init__.py	Bump version	2015-02-15 20:38:52 +00:00
notifier.py	…
python_dependencies.py	Bump webclient version	2015-02-12 10:49:07 +00:00
server.py	…
state.py	When we see a difference in current state, actually use state conflict resolution algorithm	2015-02-13 14:20:05 +00:00
types.py	…