Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Decidim to release/0.21-stable #48

Merged
merged 8 commits into from
Aug 6, 2020
Merged

Conversation

victorol1
Copy link
Contributor

@victorol1 victorol1 commented Jul 31, 2020

MERGE #47 FIRST
Upgrade Decidim to release/0.21-stable. Apply upgrade notes after deploying: https://github.com/decidim/decidim/blob/0.21-stable/CHANGELOG.md#upgrade-notes-1

@victorol1 victorol1 self-assigned this Jul 31, 2020
@victorol1 victorol1 changed the base branch from master to upgrade/0.20-stable July 31, 2020 07:07
@victorol1 victorol1 changed the title Update Decidim to release/0.21-stable Upgrade Decidim to release/0.21-stable Jul 31, 2020
Co-authored-by: Oliver Valls <oliver.vh@coditramuntana.com>
Copy link
Contributor

@tramuntanal tramuntanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good @victorol1 just one suggestion

Gemfile Outdated Show resolved Hide resolved
Víctor and others added 4 commits August 6, 2020 09:19
Base automatically changed from upgrade/0.20-stable to master August 6, 2020 07:22
@tramuntanal
Copy link
Contributor

@victorol1 some conflicts appeared, can you check please?

@victorol1
Copy link
Contributor Author

@victorol1 some conflicts appeared, can you check please?

Done! Conflicts solved.

@tramuntanal tramuntanal merged commit 0c1a005 into master Aug 6, 2020
@tramuntanal tramuntanal deleted the upgrade/0.21-stable branch August 6, 2020 07:54
@tramuntanal
Copy link
Contributor

tramuntanal commented Aug 6, 2020

We must remember to set the timezone to Madrid for all organizations @victorol1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants