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

Merge 2.6.0 into master #6053

Merged
merged 104 commits into from
Nov 3, 2022
Merged

Merge 2.6.0 into master #6053

merged 104 commits into from
Nov 3, 2022

Conversation

j0k3r
Copy link
Member

@j0k3r j0k3r commented Nov 3, 2022

2.6.0 will be the next release of wallabag, so merging the branch into master.

yguedidi and others added 30 commits May 21, 2022 23:35
Clean composer.lock after SensioDistributionBundle removal
Closes #3118

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
…troller-class

Extend right FOSRestBundle controller class
@j0k3r j0k3r added this to the 2.6.0 milestone Nov 3, 2022
Copy link
Member

@Kdecherf Kdecherf left a comment

Choose a reason for hiding this comment

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

Tests are green, lgtm

Copy link
Member

@nicosomb nicosomb left a comment

Choose a reason for hiding this comment

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

🦘

@j0k3r j0k3r merged commit 2e9965e into master Nov 3, 2022
@j0k3r j0k3r deleted the 2.6.0 branch November 3, 2022 09:53
@j0k3r j0k3r restored the 2.6.0 branch November 3, 2022 09:55
@j0k3r j0k3r deleted the 2.6.0 branch November 3, 2022 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants