javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v4

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
Adam Bradley
2017-05-02 14:40:09 -05:00
parent 4c8cf195e9 19020108aa
commit ce81a62870
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -116,9 +116,9 @@
"request": "2.75.0",
"resolve-bin": "0.4.0",
"rollup": "0.36.0",
"rollup-plugin-commonjs": "5.0.4",
"rollup-plugin-commonjs": "8.0.2",
"rollup-plugin-multi-entry": "2.0.1",
"rollup-plugin-node-resolve": "2.0.0",
"rollup-plugin-node-resolve": "3.0.0",
"rollup-plugin-uglify": "1.0.1",
"run-sequence": "1.2.2",
"sassdoc": "2.2.1",
@ -132,7 +132,7 @@
"ts-node": "1.3.0",
"tslint": "3.15.1",
"tslint-ionic-rules": "0.0.7",
"typescript": "2.3.2",
"typescript": "~2.3.2",
"vinyl": "1.2.0",
"webpack": "^2.1.0-beta.27",
"yargs": "5.0.0"