Merge remote-tracking branch 'origin/develop' into release/2.7

petrjasek · Mar 18, 2024 · d6fed8d · d6fed8d
2 parents 4bdf221 + 176c9f4
commit d6fed8d
Show file tree

Hide file tree

Showing 11 changed files with 1,205 additions and 2,042 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/e2e/package.json b/e2e/package.json
@@ -2,7 +2,7 @@
   "name": "superdesk",
   "license": "GPL-3.0",
   "dependencies": {
-    "superdesk-core": "github:superdesk/superdesk-client-core#release/2.7",
+    "superdesk-core": "github:superdesk/superdesk-client-core#develop",
     "superdesk-planning": "file:../"
   },
   "devDependencies": {

diff --git a/e2e/server/core-requirements.txt b/e2e/server/core-requirements.txt
@@ -1,3 +1,3 @@
 gunicorn==19.7.1
 honcho==1.0.1
-git+https://github.com/superdesk/superdesk-core.git@release/2.7#egg=superdesk-core
+git+https://github.com/superdesk/superdesk-core.git@develop#egg=superdesk-core