diff options
| author | Daniel Schaal <daniel@schaal.email> | 2017-06-08 17:07:01 +0200 |
|---|---|---|
| committer | Daniel Schaal <daniel@schaal.email> | 2017-06-10 11:19:07 +0200 |
| commit | f5abeadcc4afb941fd98fd8564bd259c1a316448 (patch) | |
| tree | 269c6defd903b78166ac146863dd0461f9e7815f /js | |
| parent | d5399b7b6d3c3404a5b0a1990a95b722d448a425 (diff) | |
Update moment to 2.18
momentjs was renamed to moment, update all references
Diffstat (limited to 'js')
| -rw-r--r-- | js/bower.json | 2 | ||||
| -rw-r--r-- | js/karma.conf.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/bower.json b/js/bower.json index 34e715450..ad21ba24e 100644 --- a/js/bower.json +++ b/js/bower.json @@ -28,7 +28,7 @@ "angular-sanitize": "~1.6.0", "angular-animate": "~1.6.0", "jquery": "~2.2.0", - "momentjs": "~2.12.0", + "moment": "~2.18", "es6-shim": "~0.35.0", "js-url": "~2.3.0", "masonry": "~4.0.0" diff --git a/js/karma.conf.js b/js/karma.conf.js index f9b427825..68bb0fee1 100644 --- a/js/karma.conf.js +++ b/js/karma.conf.js @@ -19,7 +19,7 @@ module.exports = function (config) { 'vendor/js-url/url.min.js', 'vendor/es6-shim/es6-shim.min.js', 'vendor/jquery/dist/jquery.js', - 'vendor/momentjs/min/moment-with-locales.js', + 'vendor/moment/min/moment-with-locales.js', 'vendor/angular/angular.js', 'vendor/angular-mocks/angular-mocks.js', 'vendor/angular-route/angular-route.js', |