Merge branch 'master' of git:glass/deploy

dev

proxy.md

@@ -6,7 +6,6 @@
 
 ```
 sed -i 's/SERVER_NAME/要配置的域名/g' proxy.conf
-
 docker cp proxy.conf nginx:/etc/nginx/http.d/
 
 docker exec -it nginx nginx -t