Merge branch 'master' into epel7

This commit is contained in:
Jamie Nguyen 2016-07-02 19:24:50 +01:00
commit 7be939a1eb

View File

@ -59,8 +59,8 @@ http {
# Settings for a TLS enabled server.
#
# server {
# listen 443 ssl;
# listen [::]:443 ssl;
# listen 443 ssl http2 default_server;
# listen [::]:443 ssl http2 default_server;
# server_name _;
# root /usr/share/nginx/html;
#