diff options
| author | CHItA <mate.bartus@gmail.com> | 2015-06-16 01:18:12 +0200 |
|---|---|---|
| committer | CHItA <mate.bartus@gmail.com> | 2015-06-16 01:18:12 +0200 |
| commit | c6308ee7c0681b5c99185f009e7a59f1c7c8f1d5 (patch) | |
| tree | 886261c56c7064da54554f2dd1698bb6bc40e0f9 /phpBB | |
| parent | 7ccb19fa001cb0f76499fd19256e60df382c6d2a (diff) | |
| parent | 002f08ba35b3b7df31565e1dcd31361153a9a90a (diff) | |
| download | forums-c6308ee7c0681b5c99185f009e7a59f1c7c8f1d5.tar forums-c6308ee7c0681b5c99185f009e7a59f1c7c8f1d5.tar.gz forums-c6308ee7c0681b5c99185f009e7a59f1c7c8f1d5.tar.bz2 forums-c6308ee7c0681b5c99185f009e7a59f1c7c8f1d5.tar.xz forums-c6308ee7c0681b5c99185f009e7a59f1c7c8f1d5.zip | |
Merge branch 'nickvergessen/ticket/13947' into 3.1.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CREDITS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index e3f2b325e8..deb36339b0 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -23,6 +23,7 @@ phpBB Project Manager: Marshalrusty (Yuriy Rusko) phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) + CHItA (Máté Bartus) dhruv.goel92 (Dhruv Goel) Elsensee (Oliver Schramm) marc1706 (Marc Alexander) |