diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-31 00:27:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-31 00:27:37 +0200 |
| commit | dafa254f1e836b6aa59ccdc8312382c1d344ca47 (patch) | |
| tree | 3b5c164309e612646cb79cfa9c07f5860b3352df | |
| parent | e309fce6aaaf5d730a76d48a03b1cbe7b0628c85 (diff) | |
| parent | f4dcb69dae9964c7d6ca9d06828d773a63a3abed (diff) | |
| download | forums-dafa254f1e836b6aa59ccdc8312382c1d344ca47.tar forums-dafa254f1e836b6aa59ccdc8312382c1d344ca47.tar.gz forums-dafa254f1e836b6aa59ccdc8312382c1d344ca47.tar.bz2 forums-dafa254f1e836b6aa59ccdc8312382c1d344ca47.tar.xz forums-dafa254f1e836b6aa59ccdc8312382c1d344ca47.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[develop-ascraeus] Correct capitalisation of NeoThermic.
| -rw-r--r-- | phpBB/docs/CREDITS.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 8c98843df5..a4ba4cb87c 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -3,7 +3,7 @@ * phpBB © Copyright phpBB Limited 2003-2014 * http://www.phpbb.com * -* phpBB is free software. You can redistribute it and/or modify it +* phpBB is free software. You can redistribute it and/or modify it * under the terms of the GNU General Public License, version 2 (GPL-2.0) * as published by the Free Software Foundation. * @@ -63,7 +63,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009] Major contributions by: leviatan21 (Gabriel Vazquez) - Neothermic (Ashley Pinner) + NeoThermic (Ashley Pinner) Raimon (Raimon Meuldijk) Xore (Robert Hetzler) |