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:
@@ -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": {
|
||||
|
||||
Reference in New Issue
Block a user