Michael Telatynski b19c1010aa Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/Analytics.js		2017-08-10 13:54:55 +01:00
..
MAudioBody.js	remove unused imports	2017-06-02 21:35:55 +01:00
MessageEvent.js	layout for file & notif panel	2016-09-11 02:14:27 +01:00
MFileBody.js	don't track error messages	2017-08-10 13:49:11 +01:00
MImageBody.js	q(...) -> Promise.resolve	2017-07-12 18:05:08 +01:00
MVideoBody.js	q(...) -> Promise.resolve	2017-07-12 18:05:08 +01:00
RoomAvatarEvent.js	width and height must be int otherwise synapse cries	2017-06-13 12:19:20 +01:00
SenderProfile.js	Better RTL support	2017-06-03 18:52:45 +03:00
TextualBody.js	Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics	2017-08-10 13:54:55 +01:00
TextualEvent.js	quick and dirty RoomAvatarEvent	2017-06-01 13:31:24 +01:00
UnknownBody.js	More i18n strings (#963)	2017-05-30 15:09:57 +01:00