Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-01-24 18:40:09 +01:00
commit 18cd315071
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

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