Luke Barnard bd106968ce Merge branch 'develop' into luke/fix-join-part-collapsing-causality ... Conflicts: src/components/structures/MessagePanel.js		2017-01-24 14:22:18 +00:00
..
AddressSelector.js	Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users	2017-01-23 11:34:44 +00:00
AddressTile.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
DeviceVerifyButtons.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
DirectorySearchBox.js	Give the search box field a name	2016-12-06 14:40:09 +00:00
EditableText.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
EditableTextContainer.js	Fix code style	2016-08-01 10:49:51 +01:00
EmojiText.js	Add EmojiText component for emoji replacement.	2016-08-10 00:31:51 +05:30
MemberEventListSummary.js	Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality	2017-01-24 14:17:11 +00:00
PowerSelector.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
ProgressBar.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
TintableSvg.js	Cache the tinted SVGs for MFileBody as data URLs (#559)	2016-11-16 14:16:51 +00:00
TruncatedList.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00
UserSelector.js	Fix a bunch of linting errors	2017-01-20 14:22:27 +00:00