Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [develop-ascraeus] Correct capitalisation of NeoThermic.
This commit is contained in:
Andreas Fischer 2014-05-31 00:27:37 +02:00
commit dafa254f1e

View file

@ -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)