Commit 703e97ad authored by Simon's avatar Simon

Merge branch 'release-1.12.2'

parents 4e3f1d86 6d27581c
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org
root = true
[*]
# Change these settings to your own preference
indent_style = space
indent_size = 4
# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false
......@@ -2,7 +2,7 @@ PROJECT=biuro-staging
IMAGE_NGINX=fholzer/nginx-brotli
IMAGE_MYSQL=mariadb:10.3
IMAGE_WORDPRESS=biuro/web:1.12.1
IMAGE_WORDPRESS=biuro/web:1.12.2
IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3
DB_NAME=staging_biuro
......
* text=auto eol=lf
This diff is collapsed.
This diff is collapsed.
Markdown is supported
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