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

Backport #2114 to v5.0 #2118

Merged
merged 2 commits into from
Jun 9, 2021
Merged

Backport #2114 to v5.0 #2118

merged 2 commits into from
Jun 9, 2021

Conversation

afdev82
Copy link
Contributor

@afdev82 afdev82 commented Jun 7, 2021

What is this pull request for?

Backport #2114 to v5.0

@tvdeyen
Copy link
Member

tvdeyen commented Jun 7, 2021

@afdev82 need to also backport #2120 Just cherry-picking the spec fix commit into here is fine.

@afdev82
Copy link
Contributor Author

afdev82 commented Jun 8, 2021

Yes, I will do that ;)

@tvdeyen
Copy link
Member

tvdeyen commented Jun 8, 2021

@afdev82 I needed to fix builds for the 5.0-stable branch. Would you mind to rebase with 5.0-stable

@tvdeyen tvdeyen merged commit b70dd0c into AlchemyCMS:5.0-stable Jun 9, 2021
@afdev82 afdev82 deleted the fix_translations_5_0 branch July 8, 2021 14:49
tvdeyen added a commit that referenced this pull request Sep 15, 2021
- Backport #2115 to v5.0 [#2126](#2126) ([dbwinger](https://github.com/dbwinger))
- Fixate Dragonfly to < 1.4 [#2122](#2122) ([tvdeyen](https://github.com/tvdeyen))
- Backport #2114 to v5.0 [#2118](#2118) ([afdev82](https://github.com/afdev82))
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.

2 participants