Erik Johnston 08e70231c9 Merge branch 'develop' of github.com:matrix-org/synapse into failures		2015-02-17 15:21:33 +00:00
..
api	Merge branch 'develop' into application-services	2015-02-11 10:03:24 +00:00
app	Merge pull request #50 from matrix-org/application-services	2015-02-13 15:06:14 +00:00
appservice	Minor tweaks based on PR feedback.	2015-02-11 16:41:16 +00:00
config	Add a cache for get_event	2015-02-11 15:01:15 +00:00
crypto	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
events	pyflakes	2015-02-11 16:52:22 +00:00
federation	Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop	2015-02-17 15:18:17 +00:00
handlers	Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop	2015-02-17 15:18:17 +00:00
http	Remove unused import	2015-02-17 15:19:54 +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 'consumeErrors' of github.com:matrix-org/synapse into develop	2015-02-17 15:18:17 +00:00
streams	Update copyright notices	2015-01-06 13:21:39 +00:00
util	Consume errors in time_bound_deferred	2015-02-17 15:13:50 +00:00
__init__.py	Bump version	2015-02-15 20:38:52 +00:00
notifier.py	Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop	2015-02-17 15:18:17 +00:00
python_dependencies.py	Bump webclient version	2015-02-12 10:49:07 +00:00
server.py	Merge branch 'develop' into application-services	2015-02-02 15:57:59 +00:00
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	Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier	2015-01-28 17:16:12 +00:00