Merge remote-tracking branch 'origin/master'

2018-09-22 21:41:24 +08:00
parent 8a43861303 e3c7e47779
commit cbbfcb098a
113 changed files with 5077 additions and 240 deletions
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "4251531889028_.pic.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}