fix: conflicts - Merge branch 'master' into develop

OpenSourcePolitics · Dec 6, 2023 · bc46f09 · bc46f09
2 parents 47ce511 + 8b6d753
commit bc46f09
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 22,630 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -578,6 +578,8 @@ GEM
     nio4r (2.6.1)
     nokogiri (1.13.4-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.13.4-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.13.4-x86_64-linux)
       racc (~> 1.4)
     oauth (1.1.0)
@@ -899,6 +901,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES