Michael Telatynski 1bc9d344ae Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting ...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/messages/TextualBody.js

2018-01-10 11:54:58 +00:00

..

AutocompleteProvider.js

comment stub method

2017-11-02 18:10:13 +00:00

Autocompleter.js

Add NotifProvider to offer @room as a completion

2017-11-02 18:54:25 +00:00

CommandProvider.js

copyrights

2017-11-02 18:01:28 +00:00

Components.js

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

DuckDuckGoProvider.js

copyrights

2017-11-02 18:01:28 +00:00

EmojiProvider.js

Merge branch 'develop' into travis/granular-settings

2017-11-03 22:00:07 -06:00

FuzzyMatcher.js

Add copyright headers

2017-06-23 18:30:16 +01:00

NotifProvider.js

unused var

2017-11-06 15:25:25 +00:00

QueryMatcher.js

Use _uniq instead of _sortedUniq for return unique matched results

2017-07-18 16:23:54 +01:00

RoomProvider.js

DRY matrix.to link generation so it is all changeable in one class

2017-12-12 23:33:40 +00:00

UserProvider.js

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting

2018-01-10 11:54:58 +00:00