Skip to content
Snippets Groups Projects
Commit 28cc16d0 authored by Ivan Gavryshko's avatar Ivan Gavryshko
Browse files

MAGETWO-50849: Contribute Ogre bugfixes and PRs

Merge remote-tracking branch 'origin/MAGETWO-50083-nginx-whitelist-phpfiles' into MAGETWO-50849-PR-task

Conflicts:
	nginx.conf.sample
parents 7073d79a 8042eb10
Branches
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