diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 12:03:02 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 12:03:02 +0200 |
| commit | 1a1fb4a915ba762e10a218e88ec9daa5f7d3472f (patch) | |
| tree | 51da3465f27984aa83e87aec4ecf81d2f2a85477 /phpBB/docs | |
| parent | 248b11c4db632171ff8035ae4f1842e59815fca8 (diff) | |
| parent | a58cc394bc4f88becefac6d520f680a4063fcede (diff) | |
| download | forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar.gz forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar.bz2 forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.tar.xz forums-1a1fb4a915ba762e10a218e88ec9daa5f7d3472f.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12120] Remove imkingdavid from active authors
Conflicts:
phpBB/docs/AUTHORS
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/CREDITS.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index edb6361b2a..c0b1d4dbe2 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -25,7 +25,6 @@ phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) dhruv.goel92 (Dhruv Goel) EXreaction (Nathan Guse) - imkingdavid (David King) marc1706 (Marc Alexander) nickvergessen (Joas Schilling) nicofuma (Tristan Darricau) @@ -56,6 +55,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] dhn (Dominik Dröscher) [05/2007 - 01/2011] GrahamJE (Graham Eames) [09/2005 - 11/2006] igorw (Igor Wiedler) [08/2010 - 02/2013] + imkingdavid (David King) [11/2012 - 06/2014] kellanved (Henry Sudhof) [04/2007 - 03/2011] Oleg (Oleg Pudeyev) [01/2011 - 05/2013] rxu (Ruslan Uzdenov) [04/2010 - 12/2012] |