Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py		2014-08-19 14:48:19 +01:00
..
fileInput	Change mouse cursor to pointer on elements user can click on	2014-08-19 11:37:07 +02:00
fileUpload	Implemented GETs for the ContentRepoResource. It all actually appears to be working.	2014-08-18 17:18:54 +01:00
matrix	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-19 14:48:19 +01:00