Mark Haines f4dad9f639 Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name ... Conflicts: synapse/storage/push_rule.py		2016-01-13 11:46:07 +00:00
..
api	Introduce a Requester object	2016-01-11 17:48:45 +00:00
app	Turn on core dumps	2016-01-07 15:34:30 +00:00
appservice	copyrights	2016-01-07 04:26:29 +00:00
config	Merge pull request #473 from matrix-org/erikj/ssh_manhole	2016-01-07 14:36:16 +00:00
crypto	copyrights	2016-01-07 04:26:29 +00:00
events	copyrights	2016-01-07 04:26:29 +00:00
federation	copyrights	2016-01-07 04:26:29 +00:00
handlers	Merge pull request #480 from matrix-org/erikj/guest_event_tightloop	2016-01-13 11:00:50 +00:00
http	copyrights	2016-01-07 04:26:29 +00:00
metrics	copyrights	2016-01-07 04:26:29 +00:00
push	Merge pull request #456 from matrix-org/store_event_actions	2016-01-08 14:47:15 +00:00
rest	Merge pull request #478 from matrix-org/daniel/userobject	2016-01-11 17:50:22 +00:00
static/client	Updates to fallback CAS login to do new token login	2015-11-06 09:57:17 +00:00
storage	Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name	2016-01-13 11:46:07 +00:00
streams	copyrights	2016-01-07 04:26:29 +00:00
util	copyrights	2016-01-07 04:26:29 +00:00
__init__.py	copyrights	2016-01-07 04:26:29 +00:00
notifier.py	Skip, rather than erroring, invalid guest requests	2016-01-05 18:12:37 +00:00
python_dependencies.py	copyrights	2016-01-07 04:26:29 +00:00
server.py	copyrights	2016-01-07 04:26:29 +00:00
state.py	copyrights	2016-01-07 04:26:29 +00:00
types.py	Introduce a Requester object	2016-01-11 17:48:45 +00:00