Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

This commit is contained in:
jgallego 2016-10-06 07:45:31 +02:00
commit 755a9c936a
1 changed files with 2 additions and 2 deletions

View File

@ -9,8 +9,8 @@
"url": "http://git.verdnatura.es:/salix"
},
"dependencies": {
"angular": "^1.4.1",
"angular-ui-router": "^0.2.15",
"angular": "^1.5.8",
"angular-ui-router": "^1.0.0-beta.3",
"oclazyload": "^0.6.3"
},
"devDependencies": {