* github-callumacrae/ticket/10783:
[ticket/10783] Added assets_version to ACP and simple_*.html.
[ticket/10783] Added assets_version to subsilver2.
[ticket/10783] Added ?assets_version to assets.
* develop-olympus:
[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
[ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
* bantu/ticket/10788:
[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
[ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
* develop-olympus:
[ticket/10774] Correctly specify index name when creating unique index on MySQL.
[ticket/10774] Add unit tests for UNIQUE index existence and creation.
* github-bantu/ticket/10774:
[ticket/10774] Correctly specify index name when creating unique index on MySQL.
[ticket/10774] Add unit tests for UNIQUE index existence and creation.
Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store
PHPBB-10734
* develop-olympus:
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()
[ticket/10561] Changed $temp_style_id to $style_id
[ticket/10561] Added function desc for phpbb_style_is_active()
[ticket/10561] Casted $config['default_style'] to int
[ticket/10561] Reverted to phpbb_style_is_active()
[ticket/10561] Added to database_update:database_update_info()
[ticket/10561] Added section in database_update.php
[ticket/10561] Moved and renamed the funtion validate_style().
[ticket/10561] Fixed syntax error and renamed return variables.
[ticket/10561] Changes made to $db->sql_fetchrow().
[ticket/10561] Changes made to function phpbb_style_is_active().
[ticket/10561] All users can choose deactivated styles (fixed).
Conflicts:
phpBB/install/database_update.php
* sadu/ticket/10561:
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()
[ticket/10561] Changed $temp_style_id to $style_id
[ticket/10561] Added function desc for phpbb_style_is_active()
[ticket/10561] Casted $config['default_style'] to int
[ticket/10561] Reverted to phpbb_style_is_active()
[ticket/10561] Added to database_update:database_update_info()
[ticket/10561] Added section in database_update.php
[ticket/10561] Moved and renamed the funtion validate_style().
[ticket/10561] Fixed syntax error and renamed return variables.
[ticket/10561] Changes made to $db->sql_fetchrow().
[ticket/10561] Changes made to function phpbb_style_is_active().
[ticket/10561] All users can choose deactivated styles (fixed).
The answer of the question "Why isn't X feature available?" in
the FAQ now mentions Area51 instead of SourceForge and GitHub
as the way to handle feature requests.
PHPBB3-10764
The answer of the question "Why isn't X feature available?" in the
FAQ now mentions GitHub instead of SourceForge as the way to handle
feature requests.
PHPBB3-10764
* brunoais/ticket/10575:
[ticket/10575] Adding public visibility to the methods.
[ticket/10575] Fixing non-static access to static functions get_instance
These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.
PHPBB3-10575
* develop-olympus:
[ticket/10760] Fix numbering in php fun facts.
[ticket/10760] Value must be quoted as it might be two words.
[ticket/10760] PHP is great. This commit is the proof.
[ticket/10760] Catch both versions of parse error output in php.
[ticket/10760] Account for display_errors=stderr in pre-commit hook.
[ticket/10760] Quote PHP_BIN when using it.
[ticket/10760] Use echo -e only if echo understands -e.
[ticket/10760] Use externally specified PHP_BIN if any.
