Aaron Raimist 5b293dd6df Remove files created by merge ... Signed-off-by: Aaron Raimist <aaron@raim.ist>		2021-12-09 09:21:12 +00:00
..
accessibility	Allow filtering room list during treeview navigation (#7219)	2021-11-29 17:18:35 +00:00
autocomplete	…
components	Auto fix	2021-12-09 09:10:23 +00:00
editor	Fix wrong indentation with nested ordered list unnesting list on edit (#7300)	2021-12-07 09:46:04 +00:00
end-to-end-tests	Remove files created by merge	2021-12-09 09:21:12 +00:00
i18n	…
i18n-test	Auto fix	2021-10-22 17:23:37 -05:00
img	…
notifications	…
settings/watchers	Unit tests for getEffectiveTheme (#7051)	2021-10-29 09:11:55 +01:00
stores	Auto fix	2021-12-09 09:10:23 +00:00
utils	Merge branch 'develop' into sort-imports	2021-12-09 08:34:20 +00:00
.eslintrc.js	…
CallHandler-test.ts	Auto fix	2021-12-09 09:10:23 +00:00
DecryptionFailureTracker-test.js	Merge branch 'develop' into sort-imports	2021-12-09 08:34:20 +00:00
KeyBindingsManager-test.ts	…
Markdown-test.ts	Refactor matrix-linkify module (#7279)	2021-12-03 14:00:56 +00:00
PosthogAnalytics-test.ts	Merge branch 'develop' into sort-imports	2021-12-09 08:34:20 +00:00
ScalarAuthClient-test.js	…
Terms-test.js	…
TextForEvent-test.ts	Auto fix	2021-10-22 17:23:37 -05:00
UserActivity-test.js	Auto fix	2021-10-22 17:23:37 -05:00
createRoom-test.js	Auto fix	2021-10-22 17:23:37 -05:00
globalSetup.js	Fix TimeZone to be UTC in Jest tests (#7082)	2021-11-04 10:39:49 +00:00
linkify-matrix-test.ts	Refactor matrix-linkify module (#7279)	2021-12-03 14:00:56 +00:00
setupTests.js	Merge branch 'develop' into sort-imports	2021-12-09 08:34:20 +00:00
skinned-sdk.js	…
test-utils.js	Auto fix	2021-10-22 17:23:37 -05:00