1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 11:28:33 +01:00

4 Commits

Author SHA1 Message Date
Andreas Fischer
1a1fb4a915 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12120] Remove imkingdavid from active authors

Conflicts:
	phpBB/docs/AUTHORS
2014-07-11 12:03:02 +02:00
Tristan Darricau
868179c295 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12120] Add nicofuma to the developers

Conflicts:
	phpBB/docs/AUTHORS
2014-07-02 22:55:00 +02:00
Andreas Fischer
f4dcb69dae [develop-ascraeus] Correct capitalisation of NeoThermic. 2014-05-31 00:25:28 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00