1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 20:45:29 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2021-09-16 11:02:36 +02:00
commit c741b65c25
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -2,7 +2,7 @@ Checklist:
- [ ] Correct branch: master for new features; 3.3.x for fixes
- [ ] Tests pass
- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/dev/master/development/coding_guidelines.html) and [3.3.x](https://area51.phpbb.com/docs/dev/3.3.x/development/coding_guidelines.html)
- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/master/coding-guidelines.html) and [3.3.x](https://area51.phpbb.com/docs/dev/3.3.x/development/coding_guidelines.html)
- [ ] Commit follows commit message [format](https://area51.phpbb.com/docs/dev/3.3.x/development/git.html)
Tracker ticket (set the ticket ID to **your ticket ID**):