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

3.7 KiB

Raw Blame History

View Raw