Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-12-24 18:43:55 +01:00
commit 5a3bb1e3f1
2 changed files with 3 additions and 3 deletions

4
package-lock.json generated
View File

@ -1003,14 +1003,14 @@
} }
}, },
"backbone.overview": { "backbone.overview": {
"version": "git+ssh://git@github.com/jcbrand/Backbone.Overview.git#2c37461bfa8d9e8bcf8284033d3242c57eafb52d", "version": "git+https://github.com/jcbrand/Backbone.Overview.git#2c37461bfa8d9e8bcf8284033d3242c57eafb52d",
"dev": true, "dev": true,
"requires": { "requires": {
"backbone": "1.3.3" "backbone": "1.3.3"
} }
}, },
"backbone.vdomview": { "backbone.vdomview": {
"version": "github:jcbrand/backbone.vdomview#f781547e9a5ce401ac4334930d74b791168114ef", "version": "git+https://github.com/jcbrand/backbone.vdomview.git#f781547e9a5ce401ac4334930d74b791168114ef",
"dev": true, "dev": true,
"requires": { "requires": {
"backbone": "1.3.3" "backbone": "1.3.3"

View File

@ -37,7 +37,7 @@
"backbone": "1.3.3", "backbone": "1.3.3",
"backbone.browserStorage": "0.0.3", "backbone.browserStorage": "0.0.3",
"backbone.overview": "git+https://github.com/jcbrand/Backbone.Overview.git", "backbone.overview": "git+https://github.com/jcbrand/Backbone.Overview.git",
"backbone.vdomview": "jcbrand/backbone.vdomview", "backbone.vdomview": "git+https://github.com/jcbrand/backbone.vdomview.git",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"bourbon": "^4.3.2", "bourbon": "^4.3.2",
"clean-css-cli": "^4.0.10", "clean-css-cli": "^4.0.10",