aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-04-08 21:59:06 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-04-08 21:59:06 +0200
commit156ae40d6fae2067a65a2125924e39e8dc5f35e1 (patch)
tree59bd94fe14d2b3ff69b43c346c2416cc4a21ab8a /git-tools/merge.php
parentMerge PR #716 branch 'callumacrae/ticket/10455' into develop-olympus (diff)
parent[ticket/10561] Removed extra tabs, changes made to $db->sql_query() (diff)
downloadphpbb-156ae40d6fae2067a65a2125924e39e8dc5f35e1.tar.gz
phpbb-156ae40d6fae2067a65a2125924e39e8dc5f35e1.tar.bz2
phpbb-156ae40d6fae2067a65a2125924e39e8dc5f35e1.zip
Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympus
* 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).
Diffstat (limited to 'git-tools/merge.php')
0 files changed, 0 insertions, 0 deletions