mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 22:02:07 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop-ascraeus

Browse Source 
* develop-olympus:
  [ticket/12120] Remove imkingdavid from active authors

Conflicts:
	phpBB/docs/AUTHORS
This commit is contained in:
Andreas Fischer 2014-07-11 12:03:02 +02:00
commit 1a1fb4a915
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/docs/CREDITS.txt
View File

@ -25,7 +25,6 @@ phpBB Lead Developer: naderman (Nils Adermann)
phpBB Developers: bantu (Andreas Fischer) phpBB Developers: bantu (Andreas Fischer)
dhruv.goel92 (Dhruv Goel) dhruv.goel92 (Dhruv Goel)
EXreaction (Nathan Guse) EXreaction (Nathan Guse)
imkingdavid (David King)
marc1706 (Marc Alexander) marc1706 (Marc Alexander)
nickvergessen (Joas Schilling) nickvergessen (Joas Schilling)
nicofuma (Tristan Darricau) 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] dhn (Dominik Dröscher) [05/2007 - 01/2011]
GrahamJE (Graham Eames) [09/2005 - 11/2006] GrahamJE (Graham Eames) [09/2005 - 11/2006]
igorw (Igor Wiedler) [08/2010 - 02/2013] igorw (Igor Wiedler) [08/2010 - 02/2013]
imkingdavid (David King) [11/2012 - 06/2014]
kellanved (Henry Sudhof) [04/2007 - 03/2011] kellanved (Henry Sudhof) [04/2007 - 03/2011]
Oleg (Oleg Pudeyev) [01/2011 - 05/2013] Oleg (Oleg Pudeyev) [01/2011 - 05/2013]
rxu (Ruslan Uzdenov) [04/2010 - 12/2012] rxu (Ruslan Uzdenov) [04/2010 - 12/2012]