Merge remote-tracking branch 'refs/remotes/origin/development' into b…

…ootstrap-5.3 # Conflicts: # Gemfile.lock
digITpro · May 17, 2024 · 1c5b0b8 · 1c5b0b8
2 parents b19d41e + fef34b9
commit 1c5b0b8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -451,7 +451,8 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (4.2.0)
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
@@ -562,6 +563,7 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stringio (3.1.0)
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-notifier-guard (1.7.0)
     thor (1.3.1)