Merge branch '3.1.x'

This commit is contained in:
Oliver Schramm 2015-03-25 22:03:15 +01:00
commit 784ccdf0b0

View file

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