chenchao / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit 4e4a0c09848000cb9c63b56f2fceb604ae6b9d4b 2 parents 5e09f68b 2383c31a

Merge branch 'master' into release/4.8

Inline Side-by-side
Showing 12 changed files with 0 additions and 4 deletions
@@ -1090,11 +1090,7 @@ class Helpers @@ -1090,11 +1090,7 @@ class Helpers
1090 { 1090 {
1091 return preg_match("/[\x7f-\xff]/", $str); 1091 return preg_match("/[\x7f-\xff]/", $str);
1092 } 1092 }
1093 -<<<<<<< HEAD  
1094 1093
1095 -=======  
1096 -  
1097 ->>>>>>> master  
1098 /** 1094 /**
1099 * 将首字符为//的url转换为http:// 1095 * 将首字符为//的url转换为http://
1100 * 1096 *
No preview for this file type
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.

48.3 KB | W: | H:

48.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

8.64 KB | W: | H:

8.64 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin