Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

liyuhang
public/.htaccess
public/favicon.ico
public/index.php
public/robots.txt
storage/app/.gitignore
storage/app/public/.gitignore
storage/framework/.gitignore
storage/framework/cache/.gitignore
storage/framework/cache/data/.gitignore
storage/framework/sessions/.gitignore
storage/framework/testing/.gitignore
storage/framework/views/.gitignore
storage/logs/.gitignore
--- a/public/.htaccess 100644 → 100755
查看文件 @301f36f
+++ b/public/.htaccess 100644 → 100755
查看文件 @301f36f
--- a/public/favicon.ico 100644 → 100755
查看文件 @301f36f
+++ b/public/favicon.ico 100644 → 100755
查看文件 @301f36f
--- a/public/index.php 100644 → 100755
查看文件 @301f36f
+++ b/public/index.php 100644 → 100755
查看文件 @301f36f
--- a/public/robots.txt 100644 → 100755
查看文件 @301f36f
+++ b/public/robots.txt 100644 → 100755
查看文件 @301f36f
--- a/storage/app/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/app/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/app/public/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/app/public/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/framework/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/framework/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/framework/cache/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/framework/cache/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/framework/cache/data/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/framework/cache/data/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/framework/sessions/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/framework/sessions/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/framework/testing/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/framework/testing/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/framework/views/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/framework/views/.gitignore 100644 → 100755
查看文件 @301f36f
--- a/storage/logs/.gitignore 100644 → 100755
查看文件 @301f36f
+++ b/storage/logs/.gitignore 100644 → 100755
查看文件 @301f36f