From f5abeadcc4afb941fd98fd8564bd259c1a316448 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <daniel@schaal.email>
Date: Thu, 8 Jun 2017 17:07:01 +0200
Subject: Update moment to 2.18

momentjs was renamed to moment, update all references
---
 js/bower.json    | 2 +-
 js/karma.conf.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

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',
-- 
cgit v1.2.3