mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [develop-ascraeus] Correct capitalisation of NeoThermic.
This commit is contained in:
commit
dafa254f1e
1 changed files with 2 additions and 2 deletions
|
@ -3,7 +3,7 @@
|
||||||
* phpBB © Copyright phpBB Limited 2003-2014
|
* phpBB © Copyright phpBB Limited 2003-2014
|
||||||
* http://www.phpbb.com
|
* 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)
|
* under the terms of the GNU General Public License, version 2 (GPL-2.0)
|
||||||
* as published by the Free Software Foundation.
|
* 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]
|
Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]
|
||||||
|
|
||||||
Major contributions by: leviatan21 (Gabriel Vazquez)
|
Major contributions by: leviatan21 (Gabriel Vazquez)
|
||||||
Neothermic (Ashley Pinner)
|
NeoThermic (Ashley Pinner)
|
||||||
Raimon (Raimon Meuldijk)
|
Raimon (Raimon Meuldijk)
|
||||||
Xore (Robert Hetzler)
|
Xore (Robert Hetzler)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue