manuroe 33edeccb43 Merge branch 'develop' into push-rules-settings ... # Conflicts: # src/component-index.js # src/components/views/rooms/RoomSettings.js		2016-01-18 18:00:41 +01:00
..
login	Do (more) client side validation of registration parameters.	2016-01-15 13:31:41 +00:00
CreateRoom.js	use getDomain()	2016-01-13 18:15:59 +00:00
MatrixChat.js	merge develop	2016-01-18 14:02:19 +00:00
RoomView.js	Merge branch 'develop' into push-rules-settings	2016-01-18 18:00:41 +01:00
ScrollPanel.js	Set our own booleans instead of using isMounted	2016-01-11 11:38:04 +00:00
UploadBar.js	Only show uploads that are going to the current room	2016-01-14 16:31:42 +00:00
UserSettings.js	Merge branch 'develop' into push-rules-settings	2016-01-18 18:00:41 +01:00