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:53:43 -07:00
parent 259057184d 8a5d3f9738
commit a779938650
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -2,10 +2,13 @@
- N/A - N/A
<<<<<<< HEAD
## [1.13.1] - 2024-10-19 ## [1.13.1] - 2024-10-19
- Fixed an auth issue on frontend [cd916c](https://github.com/caprover/caprover-frontend/commit/cd916c53c4b15ec3f71863075dc4d2a729e2266e) - Fixed an auth issue on frontend [cd916c](https://github.com/caprover/caprover-frontend/commit/cd916c53c4b15ec3f71863075dc4d2a729e2266e)
=======
>>>>>>> release
## [1.13.0] - 2024-10-19 ## [1.13.0] - 2024-10-19
- New: Added project structure [issue-158](https://github.com/caprover/caprover-frontend/pull/158) - 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,7 +44,11 @@ echo $IMAGE_NAME:$CAPROVER_VERSION
echo "**************************************" echo "**************************************"
echo "**************************************" echo "**************************************"
<<<<<<< HEAD
FRONTEND_COMMIT_HASH=cd916c53c4b15ec3f71863075dc4d2a729e2266e FRONTEND_COMMIT_HASH=cd916c53c4b15ec3f71863075dc4d2a729e2266e
=======
FRONTEND_COMMIT_HASH=9f6c377137088c10b5582c4c9cd8285a9bd450d9
>>>>>>> release
## Building frontend app ## Building frontend app
ORIG_DIR=$(pwd) ORIG_DIR=$(pwd)