* github-igorw/feature/functional-tests:
[feature/functional-tests] Introduce bootstrap method
[feature/functional-tests] Make sure functional tests only install once
Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and
MCP"
This reverts commit 88aacd0f2cffdf75af71d749c6ea602ed3912651.
PHPBB3-6632
PHPBB3-10408
PHPBB3-10504
* develop-olympus:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
* Noxwizard/ticket/10349:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
* prep-release-3.0.10:
[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
* develop-olympus:
[ticket/10093] Use correct ANSI code for clearing color.
[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.
[ticket/10093] Use color in commit-msg hook warning/error messages.
[ticket/10093] Refactor complaining in commit-msg hook for color support.
[ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.
[ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
* p/ticket/10093:
[ticket/10093] Use correct ANSI code for clearing color.
[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.
[ticket/10093] Use color in commit-msg hook warning/error messages.
[ticket/10093] Refactor complaining in commit-msg hook for color support.
[ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.
[ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
* nickvergessen/ticket/develop/10345: (21 commits)
[ticket/10345] Check directly whether the key to use exists
[ticket/10345] Return the language key when the key has an empty array
[ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form
[ticket/10345] Remove doubled check for valid plural rule
[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
[ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
[ticket/10345] Fix parsing error in language/en/viewtopic.php
[ticket/10345] Move rule determination code into a new function
[ticket/10345] Fix little type in unit test
[ticket/10345] Remove more useless 0-cases
[ticket/10345] Make the use of the 0-case optional
[ticket/10345] Remove some unused 0 cases
[ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
[ticket/10345] Add tests for array() as first parameter on call to $user->lang()
[ticket/10345] Fix some documentation issues.
[ticket/10345] Allow float as array key and add some tests
[ticket/10345] Use the plural function in some more places.
[ticket/10345] Make use of the plural function in some basic places
[ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
[ticket/10345] Fix documentation on the new function and the switch
...
* develop-olympus:
[ticket/10480] Add a build target for changelog building.
[ticket/10480] Add a build script for exporting the changelog from tracker.
[ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
* prep-release-3.0.10:
[ticket/10480] Add a build target for changelog building.
[ticket/10480] Add a build script for exporting the changelog from tracker.
[ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
* github-bantu/ticket/10480:
[ticket/10480] Add a build target for changelog building.
[ticket/10480] Add a build script for exporting the changelog from tracker.
