Merge branch '3.3.x'

This commit is contained in:
mrgoldy 2020-03-29 12:02:42 +02:00
commit c71d624a35

View file

@ -27,11 +27,12 @@ phpBB Developers: bantu (Andreas Fischer)
Derky (Derk Ruitenbeek) Derky (Derk Ruitenbeek)
Elsensee (Oliver Schramm) Elsensee (Oliver Schramm)
Hanakin (Michael Miday) Hanakin (Michael Miday)
mrgoldy (Gijs Martens)
Nicofuma (Tristan Darricau) Nicofuma (Tristan Darricau)
rubencm (Rubén Calvo) rubencm (Rubén Calvo)
For a list of phpBB Team members, please see: For a list of phpBB Team members, please see:
http://www.phpbb.com/about/team/ https://www.phpbb.com/about/team/
For a full list of phpBB code contributors, please see: For a full list of phpBB code contributors, please see:
https://github.com/phpbb/phpbb/graphs/contributors https://github.com/phpbb/phpbb/graphs/contributors