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 3.1.x into 3.2.x #4664

Merged
merged 14 commits into from
Jun 5, 2021
Merged

Conversation

derrabus
Copy link
Member

@derrabus derrabus commented Jun 5, 2021

Replaces #4633

morozov and others added 14 commits April 29, 2021 08:50
[doctrineGH-4613] Use utf8mb4 instead of utf8 for testing connection charset
Display metrics of 3.1 instead of 3.0
* 2.13.x:
  Support Doctrine Cache 2
  Display metrics of 3.1 instead of 3.0
  [doctrineGH-4613] Use utf8mb4 instead of utf8 for testing connection charset
This class has been renamed in 48625f1
* 3.1.x:
  Allow Symfony 6
  Update versions for default branch
  Address class rename in the docs
  Support Doctrine Cache 2
  Display metrics of 3.1 instead of 3.0
  [doctrineGH-4613] Use utf8mb4 instead of utf8 for testing connection charset
@morozov morozov merged commit 326cf4c into doctrine:3.2.x Jun 5, 2021
@morozov
Copy link
Member

morozov commented Jun 5, 2021

Thanks, @derrabus.

@derrabus derrabus deleted the merge/3.1.x-in-3.2.x branch June 5, 2021 16:13
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 21, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants