element-portable/src/autocomplete
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
..
AutocompleteProvider.js Merge branch 'develop' into rte-fixes2 2017-06-23 15:30:06 +01:00
Autocompleter.js Merge branch 'develop' into rte-fixes2 2017-06-23 15:30:06 +01:00
CommandProvider.js Merge branch 'develop' into rte-fixes2 2017-06-23 15:30:06 +01:00
Components.js remove unused imports 2017-06-02 21:35:55 +01:00
DuckDuckGoProvider.js copyright adjustments 2017-06-01 17:29:40 +01:00
EmojiProvider.js Merge branch 'develop' into rte-fixes2 2017-06-23 15:30:06 +01:00
FuzzyMatcher.js order User completions by last spoken 2017-03-07 04:09:26 +05:30
QueryMatcher.js order User completions by last spoken 2017-03-07 04:09:26 +05:30
RoomProvider.js Merge branch 'develop' into rte-fixes2 2017-06-23 15:30:06 +01:00
UserProvider.js Merge branch 'develop' into rte-fixes2 2017-06-23 15:30:06 +01:00