Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ... Conflicts: synapse/rest/client/v1/login.py		2015-08-20 16:25:40 +01:00
..
client	Merge branch 'develop' into refresh	2015-08-20 16:25:40 +01:00
key	Implement minimum_valid_until_ts in the remote key resource	2015-04-29 11:57:26 +01:00
media	Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails	2015-08-13 17:23:39 +01:00
__init__.py	Code style fixes.	2015-01-29 16:12:40 +00:00