Commit 296170d
committed
merge: sync with origin/development, keep sanity test rewrites
Resolved merge conflicts:
- .talismanrc: keep full sanity-check allowlist (our version)
- terms-test.js: keep rewritten Taxonomy Terms API Tests (our version)
Incoming changes from development were for the old terms-test.js structure
which has been fully replaced in this branch.File tree
0 file changed
+0
-0
lines changed0 file changed
+0
-0
lines changed
0 commit comments