Conflict merge

Browse Source

...

This commit is contained in:

Madson Jr

2018-07-18 13:26:27 -03:00

parent 238a78aafc

commit 7aba9991f6

4 changed files with 8 additions and 8 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

0

nginx/sites/default.conf → nginx/sites/default.conf.example