diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 19:24:48 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-21 19:24:48 -0500 |
| commit | e43d1781bf17c9265f075dfc0cc38d807fe3b70e (patch) | |
| tree | 69a9b789e4b55319ad043fb127ad76fb749d42ac /phpBB/docs/CREDITS.txt | |
| parent | faec26b8733facf6ef1d5bbef95011eb81b4db33 (diff) | |
| parent | d51c1707e3220173996af6fa0e870fc44ea3e94d (diff) | |
| download | forums-e43d1781bf17c9265f075dfc0cc38d807fe3b70e.tar forums-e43d1781bf17c9265f075dfc0cc38d807fe3b70e.tar.gz forums-e43d1781bf17c9265f075dfc0cc38d807fe3b70e.tar.bz2 forums-e43d1781bf17c9265f075dfc0cc38d807fe3b70e.tar.xz forums-e43d1781bf17c9265f075dfc0cc38d807fe3b70e.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
Conflicts:
phpBB/docs/AUTHORS
Diffstat (limited to 'phpBB/docs/CREDITS.txt')
| -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 c0b1d4dbe2..5c17787495 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -24,7 +24,6 @@ phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: bantu (Andreas Fischer) dhruv.goel92 (Dhruv Goel) - EXreaction (Nathan Guse) marc1706 (Marc Alexander) nickvergessen (Joas Schilling) nicofuma (Tristan Darricau) @@ -53,6 +52,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] ckwalsh (Cullen Walsh) [01/2010 - 07/2011] DavidMJ (David M.) [12/2005 - 08/2009] dhn (Dominik Dröscher) [05/2007 - 01/2011] + EXreaction (Nathan Guse) [07/2012 - 05/2014] GrahamJE (Graham Eames) [09/2005 - 11/2006] igorw (Igor Wiedler) [08/2010 - 02/2013] imkingdavid (David King) [11/2012 - 06/2014] |