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

..

crypto

Fix merge conflicts

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

autodiscovery.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

content-repo.spec.js

Switch back to plain export functions instead of class

2020-01-03 12:16:54 -07:00

crypto.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

event-timeline.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

event.spec.js

Convert tests to ES6

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

filter.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

interactive-auth.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

login.spec.js

Convert tests to ES6

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

matrix-client.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

pushprocessor.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

realtime-callbacks.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

room-member.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

room-state.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

room.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

scheduler.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

sync-accumulator.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

timeline-window.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

user.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00

utils.spec.js

Remove "source-map-support" from tests because it makes sourcemaps worse

2019-12-17 15:45:15 -07:00