mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Conflicts: phpBB/docs/hook_system.html
This commit is contained in:
Conflicts: phpBB/docs/hook_system.html