Skip to content

Sync develop branch with masters fixes#160

Merged
MarcelGeo merged 21 commits into
developfrom
master
Jan 17, 2024
Merged

Sync develop branch with masters fixes#160
MarcelGeo merged 21 commits into
developfrom
master

Conversation

@MarcelGeo
Copy link
Copy Markdown
Collaborator

No description provided.

varmar05 and others added 21 commits May 26, 2023 11:49
project files are rarely used compared to general usage of ORM Project, their load is deferred to avoid db performance issues
rename Mergin to server
docker-compose struggles with PWD sometimes, especially when the command is not run from a shell (e.g. via systemd or via ansible). This commit uses a more idiomatic relative path in the compose file, fixing these issues.
Change PWD to "." in docker-compose.yml
Prepare 2023.6.1 release + env var adjustments
@MarcelGeo MarcelGeo requested a review from varmar05 January 16, 2024 13:47
@MarcelGeo MarcelGeo merged commit 6749552 into develop Jan 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants