Mark Haines 396a67a09a Merge branch 'client_v2_filter' into client_v2_sync ... Conflicts: synapse/rest/client/v2_alpha/__init__.py		2015-01-29 14:58:00 +00:00
..
__init__.py	Merge branch 'client_v2_filter' into client_v2_sync	2015-01-29 14:58:00 +00:00
_base.py	Add client v2_alpha resource to synapse server resource tree	2015-01-23 18:55:19 +00:00
filter.py	Add filter JSON sanity checks.	2015-01-28 16:45:18 +00:00
sync.py	Add typing notifications to sync	2015-01-29 03:33:51 +00:00