Merge branch 'master' into v4

2026-03-13 10:22:08 +08:00 · 2017-04-26 12:35:14 -05:00
parent 9d526790fd 1331ce2499
commit cdffc62615
20 changed files with 191 additions and 33 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "ionic2",
-  "version": "3.0.1",
+  "version": "3.1.0",
  "description": "A powerful framework for building mobile and progressive web apps with JavaScript and Angular 2",
  "keywords": [
    "ionic",
@@ -144,4 +144,4 @@
  "pre-push#master": [
    "test"
  ]
-}
+}