Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
synapse/webclient/components/matrix
History
David Baker d72ce4da64 Merge branch 'develop' of github.com:matrix-org/synapse into develop 
Conflicts:
	synapse/http/client.py
 		2014-09-03 18:25:17 +01:00
..
event-handler-service.js Fix a few cases where we used user_id instead of state_key 2014-09-03 18:03:10 +01:00
event-stream-service.js fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch. 2014-09-03 17:31:57 +01:00
matrix-call.js fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch. 2014-09-03 17:31:57 +01:00
matrix-phone-service.js fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch. 2014-09-03 17:31:57 +01:00
matrix-service.js Merge branch 'develop' of github.com:matrix-org/synapse into develop 2014-09-03 18:25:17 +01:00
presence-service.js fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch. 2014-09-03 17:31:57 +01:00