Skip to content

Commit

Permalink
Merge branch '3.1' into 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
glye committed Jan 21, 2021
2 parents 23b76ab + 7e0efa9 commit 9df541c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .platform/varnish.vcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// - Varnish xkey vmod (via varnish-modules package 0.10.2 or higher, or via Varnish Plus)
// - eZ Platform 3.x or higher with ezplatform-http-cache (this) bundle
//
// WARNING: Not for us with Fastly, see documentation for where to find dedicated Fastly VCL.
// WARNING: Not for us with Fastly, see documentation for where to find dedicated Fastly VCL.

// Not applicable on Platform.sh:
//vcl 4.0;
Expand Down
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"php-http/guzzle6-adapter": "^2.0",
"platformsh/symfonyflex-bridge": "^2.2",
"sensio/framework-extra-bundle": "^5.5",
"sensiolabs/security-checker": "^6.0",
"symfony/asset": "^5.0",
"symfony/cache": "^5.0",
"symfony/console": "^5.0",
Expand Down Expand Up @@ -121,12 +120,10 @@
"ezplatform:encore:compile": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts",
"@php bin/security-checker security:check || true"
"@auto-scripts"
],
"post-update-cmd": [
"@auto-scripts",
"@php bin/security-checker security:check || true"
"@auto-scripts"
],
"ezplatform-install": [
"@php bin/console --ansi ezplatform:install clean",
Expand Down

0 comments on commit 9df541c

Please sign in to comment.