Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/www/chcp.json

@@ -1,9 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-<<<<<<< HEAD
-  "release": "2017.09.02-16.58.25"
-=======
-  "release": "2017.09.02-16.57.41"
->>>>>>> 6dd4478d67456f6c58400b2021c6dae28e5b841a
+  "release": "2017.09.04-14.13.11"
 }

miaomiao/www/chcp.manifest

@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "12e08ce3bb3b904cf93696fd77e69d40"
+    "hash": "aeec18dc15d998ce9c7994f70811e063"
   },
   {
     "file": "img/alipay.png",
@@ -409,7 +409,7 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "33c069f2d76b5b4470aa5d12b60293ff"
+    "hash": "91574d3bffab7dfef97a55d26db02524"
   },
   {
     "file": "js/controllers/my.js",
@@ -757,11 +757,11 @@
   },
   {
     "file": "templates/add/index.html",
-    "hash": "61eca4efaae8005807542e281a0dcaec"
+    "hash": "4326d9aecfcf082a8d118a8f39c55e7d"
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "026501c53c29696aff53fd7b3469cdd7"
+    "hash": "a3ba8feeca389e5ec9deba8b7ff967f9"
   },
   {
     "file": "templates/home/index.html",