Travis Ralston 5fd27a10bb Merge branch 'develop' into travis/sourcemaps

2020-01-13 11:19:41 -07:00

..

BaseAvatar.js

Fix import merge conflicts, removing any that aren't needed anymore

2020-01-09 14:17:33 -07:00

GroupAvatar.js

Fix MatrixClientPeg imports

2019-12-22 21:15:54 -07:00

MemberAvatar.js

Merge branch 'develop' into travis/sourcemaps

2020-01-13 11:19:41 -07:00

MemberStatusMessageAvatar.js

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

2020-01-09 14:15:09 -07:00

RoomAvatar.js

Use new imports for js-sdk's ContentRepo

2020-01-03 12:29:22 -07:00