Merge branch 'luke/fix-rte-md-mentions' of github.com:matrix-org/matrix-react-sdk into luke/fix-rte-md-mentions

Browse source

Conflicts:
	src/components/views/rooms/MessageComposerInput.js

...

This commit is contained in:

Luke Barnard 2017-07-20 15:17:36 +01:00

parent e893f994e1 b881efbc05

commit d080490ed3

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available