lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2025-12-12 14:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Kasra Bigdeli
2024-10-19 10:55:38 -07:00
parent a779938650
commit b3a64741f6
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -2,13 +2,10 @@
- N/A
<<<<<<< HEAD
## [1.13.1] - 2024-10-19
- Fixed an auth issue on frontend [cd916c](https://github.com/caprover/caprover-frontend/commit/cd916c53c4b15ec3f71863075dc4d2a729e2266e)
=======
>>>>>>> release
## [1.13.0] - 2024-10-19
- New: Added project structure [issue-158](https://github.com/caprover/caprover-frontend/pull/158)

4
dev-scripts/build_and_push_release.sh
View File

@@ -44,11 +44,7 @@ echo $IMAGE_NAME:$CAPROVER_VERSION
echo "**************************************"
echo "**************************************"
<<<<<<< HEAD
FRONTEND_COMMIT_HASH=cd916c53c4b15ec3f71863075dc4d2a729e2266e
=======
FRONTEND_COMMIT_HASH=9f6c377137088c10b5582c4c9cd8285a9bd450d9
>>>>>>> release
## Building frontend app
ORIG_DIR=$(pwd)