diff options
| author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-22 16:03:40 +0400 |
|---|---|---|
| committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-22 16:03:40 +0400 |
| commit | f564e40b5275c1dd45331137a3cd9ff44a29e106 (patch) | |
| tree | 2de887299eb344fbbcb020c571e11447e46bc67c /plugins/UsersManager | |
| parent | 1b3ee25f2d56b144487822c56ea63340eb59b8d2 (diff) | |
| parent | 45fa8a583c5217192fde370389884a795eb807ee (diff) | |
Merge branch 'master' into 2.x-twig
Conflicts:
plugins/CoreHome/templates/datatable_cell.tpl
plugins/Live/templates/lastVisits.tpl
plugins/Live/templates/visitorLog.twig
plugins/UsersManager/templates/userSettings.tpl
Diffstat (limited to 'plugins/UsersManager')
| -rw-r--r-- | plugins/UsersManager/templates/userSettings.twig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 61236e46d3..fb94dfb538 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -12,7 +12,7 @@ <input role="no" type="button" value="{{ 'General_No'|translate }}"/> </div> -<table id='userSettingsTable' class="adminTable" style='width:1000px'> +<table id='userSettingsTable' class="adminTable" style='width:1050px'> <tr> <td><label for="username">{{ 'General_Username'|translate }} </label></td> <td> |