diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
commit | 1147dc977422e827a201fa081abd07721231d072 (patch) | |
tree | 203d47297c49545a67bbdd98cbe137b255a5d6d8 /settings/templates/users.php | |
parent | 88b91a7304f2de998f71a674f4f62e85f5b83e54 (diff) | |
parent | 135680e50bf760d55a1bcaaaa02f959bde396c52 (diff) | |
download | nextcloud-server-1147dc977422e827a201fa081abd07721231d072.tar.gz nextcloud-server-1147dc977422e827a201fa081abd07721231d072.zip |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'settings/templates/users.php')
-rw-r--r-- | settings/templates/users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/templates/users.php b/settings/templates/users.php index eef9b291357..de7e50da8f3 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -142,7 +142,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>; </div> </td> <td class="remove"> - <?php if($user['name']!=OC_User::getUser()):?> + <?php if($user['name']!=OC_User::getUser()):?> <a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>"> <img src="<?php echo image_path('core', 'actions/delete.svg') ?>" /> </a> |