|
Marc
|
e43d1781bf17c9265f075dfc0cc38d807fe3b70e
e43d1781bf17c9265f075dfc0cc38d807fe3b70e |
Merge branch 'develop-olympus' into develop-ascraeus
Conflicts:
phpBB/docs/AUTHORS |
|
|
Marc
|
d51c1707e3220173996af6fa0e870fc44ea3e94d
m d51c1707e3220173996af6fa0e870fc44ea3e94d |
Merge pull request #3051 from nickvergessen/ticket/12120
[ticket/12120] Remove EXreaction from active authors |
|
|
Marc
|
faec26b8733facf6ef1d5bbef95011eb81b4db33
faec26b8733facf6ef1d5bbef95011eb81b4db33 |
Merge pull request #3053 from Senky/ticket/13194
[ticket/13194] BBCode isn't parsed when issuing a warning for a post |
|
|
Marc
|
0de7adfa37c9cdf3f7b015c2a6f11341e7f10405
0de7adfa37c9cdf3f7b015c2a6f11341e7f10405 |
Merge pull request #3052 from VSEphpbb/ticket/13041
[ticket/13041] Help_faq.php language file needs to be revised |
|
|
Senky
|
defeb1a56f9c184668a9211fc6b6f55117359efe
m defeb1a56f9c184668a9211fc6b6f55117359efe |
[ticket/13194] Use correct array to access bbcode_bitfield
PHPBB3-13194 |
|