Merge pull request #1324 from marmelab/prepare-1.0.2

fzaninotto · web-flow · commit ac8eb4ede1bf · 2017-03-17T09:42:50.000+01:00
[RFR] Prepare 1.0.2 release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+v1.0.2 - 16 Mar. 2017
+---------------------
+
+- Increase the infinite scroll performance [\#1322](https://github.com/marmelab/ng-admin/pull/1322) ([Kmaschta](https://github.com/Kmaschta))
+- Fix misleading typo on the documentation [\#1320](https://github.com/marmelab/ng-admin/pull/1320) ([matheo](https://github.com/matheo))
+
 v1.0.1 - 08 Feb. 2017
 ---------------------
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-admin",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "MIT",
   "private": false,
   "main": "lib/javascripts/ng-admin.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ng-admin",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "lib/javascripts/ng-admin.js",`