Merge branch 'main' into fix/stopwatch-duration

MarquezProject · Apr 19, 2022 · 49716cc · 49716cc
2 parents 7f64157 + 2901e25
commit 49716cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -23,7 +23,7 @@ plugins {
 ext {
     jdbi3Version = '3.28.0'
     prometheusVersion = '0.15.0'
-    testcontainersVersion = '1.16.3'
+    testcontainersVersion = '1.17.1'
     sentryVersion = '5.7.2'
 }
 

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -47,7 +47,7 @@
     "dagre": "^0.8.5",
     "http-proxy-middleware": "^0.20.0",
     "lodash": "^4.17.21",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "postcss-loader": "^3.0.0",
     "postcss-modules-values": "^2.0.0",
     "react": "^16.8.0",