diff options
| author | Cesar G <prototech91@gmail.com> | 2014-01-23 14:10:46 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-01-23 14:10:46 -0800 |
| commit | ed409d3d5b89b3a2cad04a366a09f42280735799 (patch) | |
| tree | 9b312e5425403c980f3725e5f7a8127ac26fba53 | |
| parent | 90f3cc48e572b25fa9affe156626632ab7b2b70c (diff) | |
| parent | 42e4566fe441b3405317ba4e31df5a4795e986c6 (diff) | |
| download | forums-ed409d3d5b89b3a2cad04a366a09f42280735799.tar forums-ed409d3d5b89b3a2cad04a366a09f42280735799.tar.gz forums-ed409d3d5b89b3a2cad04a366a09f42280735799.tar.bz2 forums-ed409d3d5b89b3a2cad04a366a09f42280735799.tar.xz forums-ed409d3d5b89b3a2cad04a366a09f42280735799.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus
| -rw-r--r-- | phpBB/docs/AUTHORS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 5995bd2ab4..465c4de397 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -23,10 +23,11 @@ involved in phpBB. phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) - EXreaction (Nathan Guse) dhruv.goel92 (Dhruv Goel) + EXreaction (Nathan Guse) imkingdavid (David King) nickvergessen (Joas Schilling) + prototech (Cesar Gallegos) Contributions by: leviatan21 (Gabriel Vazquez) Raimon (Raimon Meuldijk) |