Merge pull request #304 from z2014/master

progrape · web-flow · commit d8b74328073c · 2019-07-22T20:51:05.000+08:00
update version 1.2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ### CHANGELOG
 
+#### 1.2.0
+
+Changes
+
+- InfiniteLoader now support reset finish status
+
 #### 1.1.0
 
 Breaking Changes
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-weui",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "weui for react",
   "main": "./build/packages/index.js",
   "scripts": {
diff --git a/src/version.js b/src/version.js
@@ -1 +1 @@
-export default '1.1.2';
+export default '1.2.0';
diff --git a/yarn.lock b/yarn.lock
