diff options
| author | CHItA <mate.bartus@gmail.com> | 2015-06-16 01:20:22 +0200 |
|---|---|---|
| committer | CHItA <mate.bartus@gmail.com> | 2015-06-16 01:20:22 +0200 |
| commit | d5414592f102c1be9cd109d8250c5cced2a6c327 (patch) | |
| tree | ef762990a3995c7778650ed45fd8e2050d07710d | |
| parent | 2a662c5e07cdf14410bdc3cc48250443dfdeb269 (diff) | |
| parent | c6308ee7c0681b5c99185f009e7a59f1c7c8f1d5 (diff) | |
| download | forums-d5414592f102c1be9cd109d8250c5cced2a6c327.tar forums-d5414592f102c1be9cd109d8250c5cced2a6c327.tar.gz forums-d5414592f102c1be9cd109d8250c5cced2a6c327.tar.bz2 forums-d5414592f102c1be9cd109d8250c5cced2a6c327.tar.xz forums-d5414592f102c1be9cd109d8250c5cced2a6c327.zip | |
Merge branch '3.1.x'
| -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) |