anonymousland-synapse/webclient/components/matrix
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
..
event-handler-service.js When new invites come down, update the My Rooms list. Added hacks to make the display name a bit nicer (/im/sync needs to return room aliases / membership events better) 2014-08-15 17:42:11 +01:00
event-stream-service.js Change the way pagination works to support out of order events. 2014-08-19 14:19:48 +01:00
matrix-service.js Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor 2014-08-19 14:48:19 +01:00