added bacports and resolved conflicts

Browse Source

...

This commit is contained in:

Dmytro Makovey

2017-09-22 00:42:37 -07:00

parent e14f93d429 b3d961a3dc

commit 8cf93ab999

4 changed files with 15 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

nginx/extra.d/.keep

nginx/http.d/.keep