1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge pull request #2782 from marc1706/ticket/12895

[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
This commit is contained in:
Joas Schilling
2014-08-02 13:56:16 +02:00
3 changed files with 9 additions and 9 deletions

View File

@@ -58,8 +58,8 @@
<!-- ENDIF -->
<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
<dl>
<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt>
<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd>
<dt><label for="user_style">{L_BOARD_STYLE}{L_COLON}</label></dt>
<dd><select name="user_style" id="user_style">{S_STYLE_OPTIONS}</select></dd>
</dl>
<!-- ENDIF -->
<!-- INCLUDE timezone_option.html -->