Merge remote-tracking branch 'origin/v2' into v2

mautrix · Oct 25, 2024 · cf3e8f1 · cf3e8f1
2 parents 5aef8b4 + 3af5571
commit cf3e8f1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
 include:
 - project: 'mautrix/ci'
-  file: '/gov2.yml'
-
-variables:
-  BINARY_NAME_V2: mautrix-twitter
+  file: '/gov2-as-default.yml'
diff --git a/Dockerfile.v2.ci → Dockerfile.ci b/Dockerfile.v2.ci → Dockerfile.ci