Merge next

.github/dependabot.yml

@@ -1,7 +1,7 @@
 # https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 version: 2
 updates:
-    - package-ecosystem: nuget
+    - package-ecosystem: npm
       directory: /
       schedule:
           interval: daily
@@ -11,3 +11,9 @@ updates:
       schedule:
           interval: daily
       open-pull-requests-limit: 100
+    - package-ecosystem: npm
+      directory: /
+      target-branch: graphql
+      schedule:
+          interval: daily
+      open-pull-requests-limit: 100

src/lib/translations/locales/en.json

@@ -417,6 +417,7 @@
     "view.instance.repo.manual.desc": "Use this box to manually test merge a pull/merge request by entering its number and clicking \"Add Test Merge\"",
     "view.instance.repo.addmanual": "Add Test Merge",
     "view.instance.repo.testmergelabel": "Labelled",
+    "view.instance.repo.conflictlabel": "Merge Conflict",
     "view.instance.repo.norepoinfo": "You lack the permission to display information about the repository",
     "view.instance.repo.delete.title": "Delete Repository",
     "view.instance.repo.delete.desc": "This will delete the local copy of the repository. Instance settings, code modifications, event scripts and static files will be preserved.",