Merge pull request #304 from z2014/master

update version 1.2.0
weui · Jul 22, 2019 · d8b7432 · d8b7432
2 parents 0440bf8 + f2759eb
commit d8b7432
Show file tree

Hide file tree

Showing 4 changed files with 8,197 additions and 2 deletions.
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';