1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 11:39:37 +02:00

17 Commits

Author SHA1 Message Date
Marc Alexander
a03fa03dd5
Merge branch '3.2.x' 2018-02-24 18:55:09 +01:00
Marc Alexander
a9ef821253
[ticket/15466] Update CREDITS.txt to reflect Nils leaving [ci skip]
PHPBB3-15466
2018-02-22 21:41:20 +01:00
MichaelC
ddc9b720ad Merge branch '3.2.x'
* 3.2.x:
  [ticket/15463] Add MichaelC and Hanakin to the dev credits
2017-11-26 21:57:07 +00:00
Máté Bartus
d6d77a199b [ticket/15463] Add MichaelC and Hanakin to the dev credits
PHPBB3-15463
2017-11-23 09:16:54 +01:00
Derky
1dd447c4aa Merge branch '3.2.x' 2017-11-21 14:10:06 +01:00
Máté Bartus
57323d1650 [ticket/15461] Add Derky to the list of contributors.
PHPBB3-15461
2017-11-21 14:02:43 +01:00
luzpaz
e13ba99c81
[ticket/15424] Multiple typo fixes in docs & comments
Fixed typos in some docs, guidelines, some non-user-facing files.

PHPBB3-15424
2017-10-29 12:44:01 +01:00
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