Merge develop to main

mainio · Jun 27, 2024 · ba5b0c5 · ba5b0c5
2 parents 73742af + bd0f26f
commit ba5b0c5
Show file tree

Hide file tree

Showing 142 changed files with 2,213 additions and 4,286 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,2 @@
-inherit_from:
-  - .rubocop_ruby.yml
-  - .rubocop_rails.yml
+inherit_gem:
+  decidim-dev: rubocop-decidim.yml
diff --git a/.rubocop_rails.yml b/.rubocop_rails.yml