Skip to content

Commit 1f28e73

Browse files
committed
Merge branch 'develop' of github.com:decidim/decidim into fix/accessibility_on_order_by
2 parents f5e4bb9 + 7d2fc13 commit 1f28e73

1,502 files changed

Lines changed: 19877 additions & 17784 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.decidim-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.31.0.dev
1+
0.32.0.dev

.erb_lint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ linters:
126126
- author-data__extra
127127
- author-data__main
128128
- author__avatar--small
129-
- author__badge
130129
- author__date
131130
- author__name--container
132131
- author__nickname

.github/actions/spelling/excludes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
\.zip$
8484
^\.github/actions/spelling/
8585
^\Q.github/workflows/spelling.yml\E$
86+
^\Q.github/workflows/publiccode-yml-validation.yml\E$
8687
/db/migrate/
8788
/locales/
8889
^\Q.erb-lint.yml\E$
@@ -102,6 +103,7 @@
102103
^\Qdecidim-core/spec/mailers/decidim_devise_mailer_spec.rb\E$
103104
^\Qdecidim-dev/lib/decidim/dev/assets/assemblies.json\E$
104105
^\Qdecidim-dev/lib/decidim/dev/assets/base64_content.html\E$
106+
^\Qdecidim-dev/lib/decidim/dev/assets/empty_file.csv\E$
105107
^\Qdecidim-dev/lib/decidim/dev/assets/import_proposals.csv\E$
106108
^\Qdecidim-dev/lib/decidim/dev/assets/import_proposals.json\E$
107109
^\Qdecidim-dev/lib/decidim/dev/assets/import_proposals_broken.csv\E$

0 commit comments

Comments
 (0)