diff options
| author | raghunayyar <me@iraghu.com> | 2014-02-19 19:53:29 +0400 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-02 14:53:52 +0400 |
| commit | 9ba4a7621446433fcf5eed2569473984753141a0 (patch) | |
| tree | 875d7e4ffe5c90bbd82913c0b5614443ca73137b /settings/users.php | |
| parent | bf88bd108e5acc9257428f7ff6d727f157b58450 (diff) | |
resolving conflict when picking 8b81a0b
Diffstat (limited to 'settings/users.php')
| -rw-r--r-- | settings/users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/users.php b/settings/users.php index 6b16e3aff73..7bf240fa16e 100644 --- a/settings/users.php +++ b/settings/users.php @@ -115,7 +115,7 @@ if(!empty($adminGroup)) { array_multisort($sortAdminGroupsKeys, SORT_DESC, $adminGroup); } -$tmpl = new OC_Template( "settings", "users", "user" ); +$tmpl = new OC_Template( "settings", "users/main", "user" ); $tmpl->assign( 'users', $users ); $tmpl->assign( 'groups', $groups ); $tmpl->assign( 'adminGroup', $adminGroup ); |