Code commits

phpBB Master

Marc 12 Dec 2019 95f45ddf54dec3df9f3b84b78e24aef6de9fab94

Merge branch '3.3.x'
Marc 12 Dec 2019 02689df8f753488dbc567b8412a9e05f33205c48 m

Merge pull request #5751 from AlfredoRamos/ticket/16235
[ticket/16235] Fix PHP CodeSniffer ignore patterns
Marc 12 Dec 2019 94f85fee06e75dbf143afcca2b56341846ea57ac

Merge branch '3.3.x'
Marc 12 Dec 2019 d9749d5bb03fe76ae1c9fb46a2fbe6942c357664 m

Merge branch '3.2.x' into 3.3.x
Marc 12 Dec 2019 4b376de3bf87ff5f88060f5466562cf33467a731 m

Merge pull request #5771 from JoshyPHP/ticket/16251
[ticket/16251] Prevent shortened links from overriding other plugins
JoshyPHP <s9e.dev@gmail.com> 09 Dec 2019 6758190afd7b77d5800fe1e03e87ec4f2f09e91f m

[ticket/16251] Prevent shortened links from overriding other plugins
PHPBB3-16251
- phpBB/phpbb/textformatter/s9e/link_helper.php (version 6758190afd7b77d5800fe1e03e87ec4f2f09e91f)
- tests/text_formatter/s9e/link_helper_test.php (version 6758190afd7b77d5800fe1e03e87ec4f2f09e91f)
Alfredo Ramos <alfredo.ramos.sanchez@gmail.com> 29 Nov 2019 3089770fece7a4b6106ec91169d9e02465e778bc m

[ticket/16235] Fix PHP CodeSniffer ignore patterns
PHPBB3-16235
- travis/ext-sniff.sh (version 3089770fece7a4b6106ec91169d9e02465e778bc)