1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 00:02:18 +02:00

[ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x

Conflicts:
	phpBB/docs/AUTHORS

PHPBB3-13723
This commit is contained in:
Nicofuma 2015-03-25 21:39:34 +01:00
commit 7f2b932a1b

View File

@ -24,9 +24,10 @@ phpBB Lead Developer: naderman (Nils Adermann)
phpBB Developers: bantu (Andreas Fischer)
dhruv.goel92 (Dhruv Goel)
Elsensee (Oliver Schramm)
marc1706 (Marc Alexander)
nickvergessen (Joas Schilling)
nicofuma (Tristan Darricau)
Nicofuma (Tristan Darricau)
prototech (Cesar Gallegos)
For a list of phpBB Team members, please see: