summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-05-10 09:17:28 +0000
committerdakkar <dakkar@thenautilus.net>2024-05-10 09:17:28 +0000
commita9e4630cc4c6fd1e51347fdf577cfd7bbc4feec2 (patch)
treec6450a42e7cfb168593d48cb9481a5b2e1f9a704
parentmerge: fix: incorrect type for quote property (!480) (diff)
parentbump version for next devel (diff)
downloadsharkey-a9e4630cc4c6fd1e51347fdf577cfd7bbc4feec2.tar.gz
sharkey-a9e4630cc4c6fd1e51347fdf577cfd7bbc4feec2.tar.bz2
sharkey-a9e4630cc4c6fd1e51347fdf577cfd7bbc4feec2.zip
merge: bump develop after 2024.3.3 (!512)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/512 Approved-by: Marie <marie@kaifa.ch> Approved-by: Tess K <me@thvxl.se>
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--package.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be00aa7097..1da34db4e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
testCommit:
stage: test
- image: node:latest
+ image: node:iron
services:
- postgres:15
- redis
diff --git a/package.json b/package.json
index f001225290..1d6d521ccd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sharkey",
- "version": "2024.3.2-devel",
+ "version": "2024.3.3-devel",
"codename": "shonk",
"repository": {
"type": "git",