Mark Haines 7c7d9d6326 Merge branch 'develop' into event_signing		2014-10-27 16:56:08 +00:00
..
api	Merge branch 'develop' into event_signing	2014-10-17 17:33:58 +01:00
app	…
config	Fix pyflakes warnings	2014-10-27 10:33:17 +00:00
crypto	fix pyflakes warnings	2014-10-27 11:19:15 +00:00
federation	fix pyflakes warnings	2014-10-27 11:19:15 +00:00
handlers	Remove duplicate join_event from create_room	2014-10-27 16:55:51 +00:00
http	Add get_json method to 3pid http client. Better logging for errors in 3pid requests	2014-10-20 14:10:08 +01:00
rest	Fix pyflakes warnings	2014-10-27 10:33:17 +00:00
storage	fix pyflakes warnings	2014-10-27 11:19:15 +00:00
streams	…
util	…
__init__.py	Bump the other version	2014-10-18 00:29:55 +02:00
notifier.py	…
server.py	…
state.py	…
types.py	…