* bantu/ticket/10780:
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
* develop-olympus:
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
[ticket/10865] Phrase change for visiting with browser
[ticket/10865] Grammar corrections for the entire document
[ticket/10865] Typo and phrasing change
[ticket/10865] Updates and additions to /docs/INSTALL.html
Conflicts:
phpBB/docs/INSTALL.html
* p/ticket/10865:
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
[ticket/10865] Phrase change for visiting with browser
[ticket/10865] Grammar corrections for the entire document
[ticket/10865] Typo and phrasing change
[ticket/10865] Updates and additions to /docs/INSTALL.html
* dhruvgoel92/ticket/11050:
[ticket/11050] make all properties protected in all search backends
[ticket/11050] get_common_words() returns empty array for sphinx
[ticket/11050] fix tidied search query docblock language
[ticket/11050] fix min/max length docblock language
[ticket/11050] multi sentences separated by period in docblocks
[ticket/11050] fix separated spelling in docblock
[ticket/11050] fix split words doc block language
[ticket/11050] remove class word from docblocks
[ticket/11050] add missing @var in native search
[ticket/11050] replace user by phpbb_user
[ticket/11050] fix minor comment/docblocks issues
[ticket/11050] add access specifiers to native search properties
[ticket/11050] fix docblocks with description before @var
[ticket/11050] add missing @var
[ticket/11050] remove common_words property from sphinx
[ticket/11050] add access specifiers to sphinx search properties
[ticket/11050] add access specifiers to mysql search properties
[ticket/11050] add access specifiers to pgsql search properties
* develop-olympus:
[ticket/10897] Combine bot updates and bot delete.
[ticket/10897] Use same code/query for deleting.
[ticket/10897] Make sure the user we're fetching is a bot.
[ticket/10897] Do not handle IP address. There is no need.
[ticket/10897] Update by user_id instead of bot_name.
[ticket/10897] Move bot delete data to the relevant foreach loop.
[ticket/10897] Add comment about what's going on.
[ticket/10897] Remove unnecessary string casting.
[ticket/10897] Add space after foreach.
[ticket/10897] Update bots during phpBB update
[ticket/10897] Bot list updated
