Travis Ralston cea3831c20 Fix merge conflicts ...

This is done outside of the merge to highlight the changes, hopefully.

2020-01-07 14:43:36 -07:00

..

integ

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev

2020-01-07 14:37:17 -07:00

unit

Fix merge conflicts

2020-01-07 14:43:36 -07:00

MockStorageApi.js

Convert tests to ES6

2019-12-17 15:16:37 -07:00

olm-loader.js

Convert tests to ES6

2019-12-17 15:16:37 -07:00

test-utils.js

Remove ancient "use strict" annotations

2019-12-17 15:43:02 -07:00

TestClient.js

Remove ancient "use strict" annotations

2019-12-17 15:43:02 -07:00