diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-03-25 22:03:15 +0100 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-03-25 22:03:15 +0100 |
| commit | 784ccdf0b0d5b6f6b5112c7de2b414eca0712c99 (patch) | |
| tree | e6f0740d3e1baf6c8af0476104219c32c34dc94a /phpBB | |
| parent | 9e66a10bac61343d0e6b5d4bdf64655578a74dc1 (diff) | |
| parent | 9d75f3fca8bc94fd5f3357693e1c9df3b45e3ba1 (diff) | |
| download | forums-784ccdf0b0d5b6f6b5112c7de2b414eca0712c99.tar forums-784ccdf0b0d5b6f6b5112c7de2b414eca0712c99.tar.gz forums-784ccdf0b0d5b6f6b5112c7de2b414eca0712c99.tar.bz2 forums-784ccdf0b0d5b6f6b5112c7de2b414eca0712c99.tar.xz forums-784ccdf0b0d5b6f6b5112c7de2b414eca0712c99.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CREDITS.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 5c17787495..e3f2b325e8 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -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: |