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
..
components	Merge branch 'develop' into new-guest-access	2017-05-28 22:58:18 +01:00
i18n	Fix languages.json	2017-06-01 21:10:32 +02:00
img
stores	Modify RVS test to wait until room loaded	2017-06-02 09:22:48 +01:00
utils
.eslintrc.js
all-tests.js
mock-clock.js
skinned-sdk.js
test-utils.js	Fix tests	2017-05-26 11:58:45 +01:00