* 3.2.x:
[ticket/13616] Fix CS + constant in the core extension
[ticket/13616] Fix UI tests
[ticket/13616] Cleanup globals after installing the board in func tests
[ticket/13616] Updates direct call to twig environment constructor
[ticket/13616] Uses a php 5.4 compatible version
[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
Conflicts:
phpBB/composer.lock
[ticket/14559] Remove attachment BBCode tags from the quoted message
* rxu/ticket/14559:
[ticket/14559] Remove attachment BBCode tags from the quoted message
* 3.2.x:
[ticket/14561] Remove requires for functions in tests
[ticket/14561] Small change to progress bar output
[ticket/14561] Fix function docblock in activate command
[ticket/14561] Add a progress bar to reclean command
[ticket/14561] Use the user loader where appropriate
[ticket/14561] Add extra help explaining reclean command
[ticket/14561] Import classes with use statements
[ticket/14561] Remove unused use statements
[ticket/14561] Refactor tests
[ticket/14561] Reclean usernames command
[ticket/14561] User activate command
[ticket/14561] User delete command
[ticket/14561] Add more user commands
* VSEphpbb/ticket/14561:
[ticket/14561] Remove requires for functions in tests
[ticket/14561] Small change to progress bar output
[ticket/14561] Fix function docblock in activate command
[ticket/14561] Add a progress bar to reclean command
[ticket/14561] Use the user loader where appropriate
[ticket/14561] Add extra help explaining reclean command
[ticket/14561] Import classes with use statements
[ticket/14561] Remove unused use statements
[ticket/14561] Refactor tests
[ticket/14561] Reclean usernames command
[ticket/14561] User activate command
[ticket/14561] User delete command
* 3.2.x:
[ticket/13502] Also cover passing object to resolver in tests
[ticket/13502] Test getArguments() method of controller resolver
[ticket/13502] Fix coding style
[ticket/13502] Controller resolver should handle callable functions and objects
[ticket/13502] Handle callable functions/objects in controller resolver
* marc1706/ticket/13502:
[ticket/13502] Also cover passing object to resolver in tests
[ticket/13502] Test getArguments() method of controller resolver
[ticket/13502] Fix coding style
[ticket/13502] Controller resolver should handle callable functions and objects
* 3.2.x:
Revert "[ticket/14562] Language fallback for extension permissions"
[ticket/14562] Language fallback for extension permissions (3.2.x)
[ticket/14562] Language fallback for extension permissions
[ticket/14562] Language fallback for extension permissions (3.2.x)
* kasimi/ticket/14562-3.2.x:
[ticket/14562] Language fallback for extension permissions (3.2.x)
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).
PHPBB3-14495
