Merge main into beta for release/beta-to-main

Resolved conflicts in CHANGELOG.md, backend/package.json, and
frontend/package.json. Version set to 3.15.1.
This commit is contained in:
Paul Nothaft
2026-02-21 20:43:46 +01:00
4 changed files with 21 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "picpeak-backend",
"version": "3.15.1-beta.0",
"version": "3.15.1",
"description": "Backend for PicPeak event photo sharing platform",
"main": "server.js",
"scripts": {