Merge branch 'develop' of gitee.com:gongfuxiang/shopxo into develop

0eb3c23b · devil_gong · 61b542f1 · 4e1d8d2b · 0eb3c23b · 0eb3c23b
隐藏空白更改
内联并排

Showing with 11 addition and 2 deletion

Crazy.php Crazy.php +10 -0

index.php index.php +1 -2

未找到文件。
--- a/Crazy.php
+++ b/Crazy.php
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Crazy
+ * Email: crazys@126.com
+ * Date: 2018/12/29
+ * Time: 11:13
+ */
+
+$test='这是一个测试文件，用来测试Pull Request贡献代码的。';
\ No newline at end of file
--- a/index.php
+++ b/index.php
@@ -13,5 +13,4 @@
 define('IS_ROOT_ACCESS', true);

 // 引入公共入口文件
-require './public/index.php';
-?>
\ No newline at end of file
+require './public/index.php';
\ No newline at end of file