Merge branch 'develop' into rte-fixes2

Browse Source

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

...

This commit is contained in:

Luke Barnard

2017-06-23 15:30:06 +01:00

parent f5a23c14df cddac3516b

commit 87609582c6

216 changed files with 21940 additions and 3614 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

640

src/components/structures/UserSettings.js

File diff suppressed because it is too large Load Diff