# Conflicts: # .github/workflows/licenses.yml # .github/workflows/linting.yml # .github/workflows/tests.yml # app/assets/javascripts/discourse-common/package.json # app/assets/javascripts/discourse/lib/dialog-holder/yarn.lock # app/assets/javascripts/discourse/package.json # app/assets/javascripts/yarn.lock # lib/tasks/assets.rake # yarn.lock |
||
|---|---|---|
| .. | ||
| colocated-template-compiler.js | ||
| index.js | ||
| package.json | ||