Erik Johnston e3aec9bc81 Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse ... Conflicts: webclient/room/room-controller.js		2014-09-12 18:19:32 +01:00
..
room-controller.js	Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse	2014-09-12 18:19:32 +01:00
room-directive.js	BF: tab completion did not work with commands. $scope.input contained only the typed chars not the result of the completion.	2014-09-05 18:46:34 +02:00
room.html	CSS m.room.topic and m.room.name events in the history	2014-09-12 11:56:08 +02:00