Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-11-19 17:27:57 +01:00
commit c929ec700e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

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