diff options
| author | Cesar G <prototech91@gmail.com> | 2014-01-23 14:13:34 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-01-23 14:13:34 -0800 |
| commit | 4c102322c122d6839beddde496483e639739b7db (patch) | |
| tree | e8b47c829df5be83534fc6a8189e1fe6ca4602b2 /phpBB/docs/AUTHORS | |
| parent | 79089ad7fe8651c5688358a341e7b2530215807b (diff) | |
| parent | ed409d3d5b89b3a2cad04a366a09f42280735799 (diff) | |
| download | forums-4c102322c122d6839beddde496483e639739b7db.tar forums-4c102322c122d6839beddde496483e639739b7db.tar.gz forums-4c102322c122d6839beddde496483e639739b7db.tar.bz2 forums-4c102322c122d6839beddde496483e639739b7db.tar.xz forums-4c102322c122d6839beddde496483e639739b7db.zip | |
Merge branch 'develop-olympus' into develop
Diffstat (limited to 'phpBB/docs/AUTHORS')
| -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 d70a1940ff..5ca52c19c0 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) |