David Baker cb03fafdf1 Merge branch 'develop' into csauth		2015-04-17 13:51:10 +01:00
..
client	Register the 3pid servlet	2015-04-17 13:44:55 +01:00
key	Move server key api into rest/key/v1	2015-04-14 13:28:11 +01:00
media	SYN-282: Don't log tracebacks for client errors	2015-02-18 12:01:37 +00:00
__init__.py	Code style fixes.	2015-01-29 16:12:40 +00:00