Skip to content

Commit

Permalink
Merge pull request #3 from Kondeo/updateIonic
Browse files Browse the repository at this point in the history
Applied the changes from PR 242 by shinejikids:ionic-stable
  • Loading branch information
julianpoy committed Nov 18, 2015
2 parents c31d1fb + b13a3f9 commit 6c289fd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions templates/common/_bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "<%= appName %>",
"version": "0.0.0",
"dependencies": {
"ionic": "v1.0.0-rc.3",
"ngCordova": "v0.1.14-alpha"
"ionic": "v1.1.0",
"ngCordova": "v0.1.20-alpha"
},
"devDependencies": {
"angular-mocks": "~1.3.6",
Expand All @@ -13,4 +13,3 @@
"angular": ">= 1.3.6"
}
}

4 changes: 2 additions & 2 deletions templates/common/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"glob": "~4.3.5",
"grunt-autoprefixer": "~2.2.0",
"grunt-wiredep": "^2.0.0",
"ionic": "^1.3.7",
"grunt-concurrent": "~1.0.0",
"ionic": "^1.6.4",
"grunt-concurrent": "1.0.0",
"grunt-contrib-clean": "~0.6.0",<% if (compass) { %>
"grunt-contrib-compass": "~1.0.1",<% } %>
"grunt-contrib-concat": "~0.5.0",
Expand Down

0 comments on commit 6c289fd

Please sign in to comment.