Skip to content

Commit

Permalink
Merge branch 'develop' into feature/share_unpublish_components_with_t…
Browse files Browse the repository at this point in the history
…okens
  • Loading branch information
microstudi committed Jul 23, 2024
2 parents f557826 + bcfb7db commit 6b6339b
Show file tree
Hide file tree
Showing 720 changed files with 3,826 additions and 3,782 deletions.
2 changes: 1 addition & 1 deletion .decidim-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.29.0.dev
0.30.0.dev
7 changes: 7 additions & 0 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,13 @@ contingut
continuar
contrasenya
coopdevs
Correu
Cov
Cprojects
crdownload
createcluster
createuser
crear
crowdin
crt
cryptor
Expand All @@ -163,6 +165,7 @@ csslintrc
CSSs
csvfile
cta
cuenta
Cugat
customise
Customising
Expand Down Expand Up @@ -415,6 +418,7 @@ initialiser
inodes
inputdialog
inputname
Inscriu
interf
inviteduser
isbn
Expand Down Expand Up @@ -793,6 +797,7 @@ setseed
sgid
shakapacker
sharedapp
shellwords
shortanswer
shs
sidekiq
Expand Down Expand Up @@ -887,6 +892,7 @@ timeoutable
timeouter
timestamped
tiptap
Tmpname
TLDR
todos
Tomorrowland
Expand All @@ -905,6 +911,7 @@ tumblr
turbolinks
Twilio
tzid
tzip
uber
ucw
ueee
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
POSTGRES_PASSWORD: postgres
redis:
image: redis
ports: ["6379:6379"]
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
Expand Down
10 changes: 3 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@

## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)

### Added
Nothing.

### Changed

### Fixed

### Removed
...

## Previous versions

Please check [release/0.28-stable](https://github.com/decidim/decidim/blob/release/0.28-stable/CHANGELOG.md) for previous changes.
Please check [0.29-stable](https://github.com/decidim/decidim/blob/release/0.29-stable/CHANGELOG.md) for previous changes.
Loading

0 comments on commit 6b6339b

Please sign in to comment.