Stefan Parviainen 2c1618bc10 Fix conflict and update strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>		2017-11-15 20:40:51 +01:00
..
MAudioBody.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
MFileBody.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
MImageBody.js	Convert synced settings to granular settings	2017-10-29 01:43:52 -06:00
MVideoBody.js	Convert synced settings to granular settings	2017-10-29 01:43:52 -06:00
MessageEvent.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
RoomAvatarEvent.js	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
SenderProfile.js	Add note about alternative to opacity	2017-11-14 20:13:00 +01:00
TextualBody.js	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:18:41 -07:00
TextualEvent.js	Run eslint --fix	2017-10-11 17:56:17 +01:00
UnknownBody.js	Handle redaction with no sender	2017-10-25 17:37:20 +01:00