makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2023-06-19 11:44:55 +02:00
commit 5ff11d9889
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View file

@ -5,6 +5,6 @@ Checklist:
- [ ] 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**):
Tracker ticket:
https://tracker.phpbb.com/browse/PHPBB3-12345

2
phpBB/docs/CREDITS.txt
View file

@ -25,7 +25,6 @@ phpBB Lead Developer: Marc (Marc Alexander)
phpBB Developers: CHItA (Máté Bartus)
Derky (Derk Ruitenbeek)
Hanakin (Michael Miday)
mrgoldy (Gijs Martens)
Nicofuma (Tristan Darricau)
rubencm (Rubén Calvo)
@ -64,6 +63,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
imkingdavid (David King) [11/2012 - 06/2014]
kellanved (Henry Sudhof) [04/2007 - 03/2011]
MichaelC (Michael Cullum) [11/2017 - 09/2019]
mrgoldy (Gijs Martens) [03/2020 - 06/2023]
nickvergessen (Joas Schilling)[04/2010 - 12/2015]
Oleg (Oleg Pudeyev) [01/2011 - 05/2013]
prototech (Cesar Gallegos) [01/2014 - 12/2016]