mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-12 11:44:08 +02:00
Merge branch 'develop' into ticket/10380
* develop: (325 commits) [ticket/10641] Update MCP template with new plurality forms [ticket/10637] Leftovers from implementation of extensions in convertor [ticket/10637] Leftovers from implementation of extensions in develop tools [ticket/10637] Leftovers from implementation of extensions in mcp_post [ticket/10637] Leftovers from implementation of extensions in mcp_main [ticket/10637] Leftovers from implementation of extensions [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header(). [ticket/10633] Stop leaking filename of attachments when thumbnail is requested [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators(). [ticket/10634] Specify module type when viewing profile [ticket/10634] Changing p_master::is_full_class [ticket/10569] Invalid string comparison in prosilver [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop [ticket/10512] Call startup.php from tests/bootstrap.php [ticket/10535] Delete no longer needed email confirm language entries. [ticket/9914] Add backup warning to updater. [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles ...
This commit is contained in:
@@ -1,14 +1,9 @@
|
||||
/* phpBB 3.0 Style Sheet
|
||||
/* phpBB3 Style Sheet
|
||||
--------------------------------------------------------------
|
||||
Style name: subsilver2
|
||||
Based on style: subSilver (the default phpBB 2 style)
|
||||
Original author: subBlue ( http://www.subBlue.com/ )
|
||||
Modified by: psoTFX and the phpBB team ( http://www.phpbb.com )
|
||||
|
||||
This is an alternative style for phpBB3 for those wishing to stay with
|
||||
the familiar subSilver style of phpBB version 2.x
|
||||
|
||||
Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
|
||||
Style name: subsilver2
|
||||
Based on style: subSilver (the default phpBB 2.0.x style)
|
||||
Original author: Tom Beddard ( http://www.subblue.com/ )
|
||||
Modified by: phpBB Group ( http://www.phpbb.com/ )
|
||||
--------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# @package phpBB3
|
||||
# @copyright (c) 2005 phpBB Group
|
||||
# @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
||||
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
#
|
||||
#
|
||||
# At the left is the name, please do not change this
|
||||
|
Reference in New Issue
Block a user