Skip to content
Snippets Groups Projects
Commit 0ca7e7da authored by Guilherme Arthur Gerônimo's avatar Guilherme Arthur Gerônimo
Browse files

Merge branch 'main' into '38-fixes-for-standalone-development' 

# Conflicts:
#   bin/smartdata/Config.php.template
#   docker-compose.yml
parents f83f1018 18dd1ef3
No related branches found
No related tags found
1 merge request!19Resolve "Fixes for standalone development"
This commit is part of merge request !19. Comments created here will be created in the context of that merge request.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4619 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment