cloudron
/
minio-app
mirror of https://git.cloudron.io/cloudron/minio-app
1
0
Fork 0
Code Issues Releases Wiki Activity

merge error

This commit is contained in:
Girish Ramakrishnan 2023-01-03 18:09:32 +01:00
parent 9ee3f02a10
commit 2c9a35effb
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CloudronManifest.json
View File

@ -5,13 +5,8 @@
"description": "file://DESCRIPTION.md", "description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG", "changelog": "file://CHANGELOG",
"tagline": "Distributed object storage", "tagline": "Distributed object storage",
<<<<<<< HEAD
"version": "3.3.3",
"upstreamVersion": "2022-12-12T19-27-27Z",
=======
"version": "3.4.0", "version": "3.4.0",
"upstreamVersion": "2023-01-02T09-40-09Z", "upstreamVersion": "2023-01-02T09-40-09Z",
>>>>>>> d881396 (Version 3.4.0)
"healthCheckPath": "/minio/login", "healthCheckPath": "/minio/login",
"memoryLimit": 805306368, "memoryLimit": 805306368,
"httpPort": 8000, "httpPort": 8000,