diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-03-25 21:39:34 +0100 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-03-25 21:40:12 +0100 |
| commit | 7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd (patch) | |
| tree | 5de5d8e91800a35d89f48abb85f30a31ce43f117 /phpBB/docs/CREDITS.txt | |
| parent | 50b3c2b49e422aa47986f608c7b109783fc2a4ed (diff) | |
| parent | 44540b611254cd3adc428f534d5904690b7a81ef (diff) | |
| download | forums-7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd.tar forums-7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd.tar.gz forums-7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd.tar.bz2 forums-7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd.tar.xz forums-7f2b932a1bcfa50de6bbdb29e54ef963a1c051bd.zip | |
[ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x
Conflicts:
phpBB/docs/AUTHORS
PHPBB3-13723
Diffstat (limited to 'phpBB/docs/CREDITS.txt')
| -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: |