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
..
client	Merge branch 'client_v2_filter' into client_v2_sync	2015-01-29 14:58:00 +00:00
media	Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events	2015-01-28 16:58:23 +00:00
__init__.py	Merge branch 'develop' into pushers	2015-01-22 17:46:16 +00:00