* upstream/develop: (259 commits)
[prep-release-3.0.11] Bumping version number for 3.0.11 final.
[feature/php-events] Fix doc of core.viewonline_overwrite_location
[feature/php-events] Fix doc of core.user_set_default_group
[feature/php-events] Fix doc of core.generate_smilies_after
[feature/php-events] Fix doc of core.delete_user_after
[feature/php-events] Fix doc of core.delete_user_before
[feature/php-events] Fix doc of core.update_username
[feature/php-events] Fix doc of core.memberlist_prepare_profile_data
[feature/php-events] Fix doc and position of viewonline_overwrite_location
[feature/php-events] Fix doc of core.viewtopic_get_post_data
[feature/php-events] Fix doc of core.viewtopic_cache_guest_data
[ticket/11061] Add the --dev flag to the composer instructions in README
[ticket/11060] Make sure pyrus can install everything on travis
[ticket/11059] Use https for the README logo
[feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
[feature/php-events] Fix core.acp_manage_forums_update_data_after vars
[ticket/11032] fix language of error displayed
[ticket/11052] update search backend constructor everywhere
[ticket/11052] pass parametes to search construct while posting
[ticket/11054] Fixed $config var description
...
Conflicts:
phpBB/includes/cron/task/core/tidy_cache.php
phpBB/includes/cron/task/core/tidy_search.php
* develop: (441 commits)
[feature/new-tz-handling] Don't use global user but make it a parameter
[feature/new-tz-handling] Fix size of suggestion button in chrome
[feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
[feature/new-tz-handling] Add previous selected value to validation if valid
[feature/new-tz-handling] Display suggestion when a different value is selected
[ticket/10998] Add border-radius to forum rules block - prosilver
[feature/new-tz-handling] Remove additional marking of selected items
[feature/new-tz-handling] Move update helper function to new class
[feature/new-tz-handling] Fix unit test
[feature/new-tz-handling] Delete old variable which is not used anymore
[feature/new-tz-handling] Rename $user->tz back to $user->timezone
[feature/pagination-as-list] New parameter for name of start var
[feature/pagination-as-list] Updates for nils comments
[feature/pagination-as-list] Rename and deprecate functions
[feature/pagination-as-list] Various fixes and improvements
[ticket/10968] Render pagination within the template
[feature/new-tz-handling] Remove "timezone might be numeric"
[feature/new-tz-handling] Add function to update the timezone
[feature/new-tz-handling] Correctly update user and board timezones on update
[ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
...
Conflicts:
phpBB/common.php
phpBB/composer.json
phpBB/composer.lock
tests/cron/task_provider_test.php
