Luke Barnard 619830617a Merge branch 'develop' into luke/ilag-i18n ... In order to get ILAG internationalised Conflicts: src/components/structures/LoggedInView.js src/components/structures/MatrixChat.js src/components/views/dialogs/ChatCreateOrReuseDialog.js src/components/views/dialogs/SetDisplayNameDialog.js src/createRoom.js src/i18n/strings/en_EN.json		2017-06-05 16:08:03 +01:00
..
AliasSettings.js	First round	2017-06-02 10:18:31 +01:00
ColorSettings.js	Replace NeedToRegisterDialog /w SetMxIdDialog	2017-05-15 17:31:26 +01:00
UrlPreviewSettings.js	First round	2017-06-02 10:18:31 +01:00