Mark Haines 5201c66108 Merge branch 'develop' into markjh/v2_sync_typing
Conflicts:
	synapse/handlers/sync.py
2015-10-21 15:48:34 +01:00
..
2015-10-09 15:48:31 +01:00
2015-10-20 11:58:58 +01:00
2015-08-13 16:58:10 +01:00
2015-08-26 16:03:17 +01:00
2015-10-20 11:58:58 +01:00
2015-10-16 15:32:56 +01:00
2015-08-26 11:08:23 +01:00