element-web/src/components/views
Luke Barnard 87609582c6 Merge branch 'develop' into rte-fixes2
Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js
2017-06-23 15:30:06 +01:00
..
avatars Implement /user/@userid:domain?action=chat 2017-06-02 11:36:18 +01:00
create_room Add more translations.. 2017-06-08 09:44:58 +01:00
dialogs Fix ability to invite users with caps in their user IDs 2017-06-20 15:46:54 +01:00
elements fullstop fails 2017-06-12 15:36:24 +01:00
login Make sure captcha disappears when container does 2017-06-16 10:25:51 +01:00
messages width and height must be int otherwise synapse cries 2017-06-13 12:19:20 +01:00
room_settings Self-review 2017-06-08 14:36:20 +01:00
rooms Merge branch 'develop' into rte-fixes2 2017-06-23 15:30:06 +01:00
settings Make enter submit change password form 2017-06-14 14:50:48 +01:00
voip Everything but src/components/views/rooms 2017-06-08 12:33:29 +01:00