Merge branch 'angular-1.7.9' of git://github.com/lkiesow/opencast int…

…o r/8.x
plapadoo · Nov 27, 2019 · db34592 · db34592
2 parents 07a4747 + 42d26e4
commit db34592
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/modules/admin-ui/bower.json b/modules/admin-ui/bower.json
@@ -5,7 +5,7 @@
     "jquery": "3.4.1",
     "jquery-ui": "1.12.1",
     "jqueryui-timepicker-addon": "1.6.3",
-    "angular": "1.7.8",
+    "angular": "1.7.9",
     "angular-route": "1.7.8",
     "angular-resource": "1.7.8",
     "angular-animate": "1.7.8",
@@ -28,5 +28,8 @@
     }
   },
   "appPath": "src/main/webapp",
-  "moduleName": "adminNg"
+  "moduleName": "adminNg",
+  "resolutions": {
+    "angular": "1.7.9"
+  }
 }