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

..

FlairStore.js

Log an error to get group profile data

2018-01-02 18:55:50 +00:00

GroupStore.js

Document GroupStore.registerListener

2018-01-02 18:12:08 +00:00

GroupStoreCache.js

Implement TagPanel (or LeftLeftPanel) for group filtering

2017-11-29 16:53:43 +00:00

LifecycleStore.js

de-lint LifecycleStore

2017-07-01 14:35:40 +01:00

MessageComposerStore.js

Remove RTE content_state logging

2017-07-06 11:17:54 +01:00

RoomScrollStateStore.js

Re-add doc on scroll state map structure

2017-09-08 13:27:14 +01:00

RoomViewStore.js

Implement Rich Quoting/Replies

2017-12-10 12:50:41 +00:00

SessionStore.js

Remove redundant reset

2017-05-31 15:32:55 +01:00

TagOrderStore.js

Combine TagOrderStore and FilterStore

2018-01-03 11:33:59 +00:00