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

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.08.23-18.23.45"
+  "release": "2017.08.24-18.40.21"
 }

miaomiao/www/chcp.manifest

@@ -13,7 +13,7 @@
   },
   {
     "file": ".idea/workspace.xml",
-    "hash": "0ca83fcf6e1f13fc63df3fbf698ca565"
+    "hash": "210b8584491c81a232e780073afb48c4"
   },
   {
     "file": ".idea/www.iml",
@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "a756d7e02ed8e14f4b56de9ea23412ce"
+    "hash": "31b444c02568e09999f96319c1e0c401"
   },
   {
     "file": "img/alipay.png",
@@ -111,6 +111,10 @@
     "file": "img/emoticon.png",
     "hash": "47c618360e462e57e7246abcbfa14dca"
   },
+  {
+    "file": "img/friends.svg",
+    "hash": "53c2b915c069dbc97f415d1e3da43536"
+  },
   {
     "file": "img/haoyou.png",
     "hash": "69c9dc354fc78ccc222e1934e03bf64d"
@@ -327,6 +331,10 @@
     "file": "img/king.png",
     "hash": "7a74235775e6b25d90e496bea37b3d2b"
   },
+  {
+    "file": "img/Moments.svg",
+    "hash": "64f414ca3d27e4b453f10dd2a50cf300"
+  },
   {
     "file": "img/nan.png",
     "hash": "bf9f107acb8fbd90992efcd92a7a7e60"
@@ -369,11 +377,11 @@
   },
   {
     "file": "js/config/router.js",
-    "hash": "e5fae9284235efb500d94ace6ec81f86"
+    "hash": "d46342ba91814d876d1f6363ec01d803"
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "fe3ef2c90e4b2caa1208b2c672dc54b9"
+    "hash": "66b3cf6b86a8768db44c4a8999c00cf9"
   },
   {
     "file": "js/controllers/add.js",
@@ -381,7 +389,7 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "3f2f9d1aec9286050dbb523a76e40eb0"
+    "hash": "d26d0c77be3f7f68014fb49af5af1731"
   },
   {
     "file": "js/controllers/my.js",
@@ -393,11 +401,11 @@
   },
   {
     "file": "js/directives/directive.js",
-    "hash": "367e98933d90b42be32ab7da68af9adc"
+    "hash": "d7a3cab12d6df7b0bdd75273b193a702"
   },
   {
     "file": "js/filters/filter.js",
-    "hash": "85292a7deef8d136aa06e31d1533ac8b"
+    "hash": "1d8e1b2e57bc381c3e8bb48aa0f4e5f2"
   },
   {
     "file": "js/platformOverrides.js",
@@ -413,7 +421,7 @@
   },
   {
     "file": "js/services/homeservice.js",
-    "hash": "6c4903ba1b134dcca60a67627174c0bc"
+    "hash": "6dab0d50b06b07f1a61d5c8072dba3ec"
   },
   {
     "file": "js/services/httpinterceptor.js",
@@ -437,7 +445,7 @@
   },
   {
     "file": "js/services/userservice.js",
-    "hash": "8e00d462cf35b59f9f682b60db10d83b"
+    "hash": "133aeffa93550f16a20a238935e1ba5e"
   },
   {
     "file": "js/services/utilservice.js",
@@ -711,13 +719,17 @@
     "file": "lib/ionic/version.json",
     "hash": "721aa5850970a96f989a738432b910fe"
   },
+  {
+    "file": "manifest.json",
+    "hash": "cec6607f6cc8f6a2dfb9ad4773926ec7"
+  },
   {
     "file": "templates/account/login.html",
-    "hash": "d7ec097c6b4560a23ce5c5b19d953406"
+    "hash": "12230625b514919df06b4aad59bcb310"
   },
   {
     "file": "templates/account/loginAccount.html",
-    "hash": "77c0e041f70b3c9bb3954f5973bcf991"
+    "hash": "c42b621513548233e6d9e2e552420663"
   },
   {
     "file": "templates/add/addExplain.html",
@@ -729,11 +741,11 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "d620451043f133f2bb98b3ed84f637a1"
+    "hash": "6842b9976094aab85e99f52f62ccdce2"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "935146196b3ff3dceb761e5db0618d33"
+    "hash": "05e7de1aeb3097a3af063ef606554945"
   },
   {
     "file": "templates/home/oldDream.html",