-
Ivan Gavryshko authored
Merge remote-tracking branch 'origin/MAGETWO-50083-nginx-whitelist-phpfiles' into MAGETWO-50849-PR-task Conflicts: nginx.conf.sample
28cc16d0
Merge remote-tracking branch 'origin/MAGETWO-50083-nginx-whitelist-phpfiles' into MAGETWO-50849-PR-task Conflicts: nginx.conf.sample