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

3.7 KiB

Raw Blame History

View Raw