Kegan Dougal c059c9fea5 Merge branch 'develop' into application-services ...

Conflicts:
	synapse/handlers/__init__.py
	synapse/storage/__init__.py

2015-02-02 15:57:59 +00:00

..

appservice

Add basic application_services SQL, and hook up parts of the appservice store to read from it.

2015-01-28 11:59:38 +00:00

client

Spit out server default rules too.

2015-01-30 15:54:51 +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

Code style fixes.

2015-01-29 16:12:40 +00:00