Luke Barnard 5151264f60 Merge branch 'develop' into new-guest-access ... Conflicts: src/component-index.js		2017-05-11 13:22:30 +01:00
..
components	Combine data-scroll-token and -contained-scroll-tokens	2017-05-04 10:00:13 +01:00
img	…
utils	Megolm import: Fix handling of short files	2017-01-31 12:30:30 +00:00
.eslintrc.js	Add mocha env for tests in eslint config	2017-01-23 14:16:25 +00:00
all-tests.js	…
mock-clock.js	…
skinned-sdk.js	…
test-utils.js	Mock isGuest	2017-05-02 10:14:54 +01:00