Merge remote-tracking branch 'origin/master'

2017-08-03 13:19:15 +08:00 · 2017-08-03 13:19:15 +08:00 · 9ded2ac223
parent 5d4db18c01 462c9566f7
commit 9ded2ac223
1 changed files with 3 additions and 2 deletions
--- a/test.json
+++ b/test.json
@ -2,6 +2,7 @@
  "test": "test",
  "dd": [
    1,
-    2
+    2,
+    3
  ]
-}
+}