1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 20:19:13 +02:00

10 Commits

Author SHA1 Message Date
Marc Alexander
743d3af3c5
[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2
PHPBB3-14961
2017-01-06 12:06:39 +01:00
Joas Schilling
c9ea560c63 [ticket/14788] Farewell
PHPBB3-14788
2016-11-12 12:12:01 +01:00
Marc Alexander
0d3ca3883e
[ticket/14788] Update CREDITS.txt
PHPBB3-14788
2016-09-18 12:16:44 +02:00
Joas Schilling
002f08ba35 [ticket/13947] Add CHItA to the list of developers
PHPBB3-13947
2015-06-16 00:17:00 +02:00
Nicofuma
7f2b932a1b [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x
Conflicts:
	phpBB/docs/AUTHORS

PHPBB3-13723
2015-03-25 21:40:12 +01:00
Marc Alexander
e43d1781bf Merge branch 'develop-olympus' into develop-ascraeus
Conflicts:
	phpBB/docs/AUTHORS
2014-10-21 19:24:48 -05:00
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