diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 09:28:48 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 09:28:48 -0700 |
| commit | 090c4d016baec6376d6d26c347c3e1ca11a929d5 (patch) | |
| tree | ddab7b8e10cf635b7f45c0c18bdf809c848334a3 /modules/user | |
| parent | c9a030dd08711f89a985504ce26378a315d7ff1f (diff) | |
| parent | 4949a2ce0b5daca7afe86a261be447440fce7eff (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
lib/gallery.common.css
themes/admin_wind/views/admin.html.php
themes/night_wind/views/sidebar.html.php
themes/wind/views/sidebar.html.php
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/views/admin_users.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 899e0b68..cee7c1eb 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -106,7 +106,7 @@ </div> </div> -<div id="g-group-admin" class="g-block g-clearfix"> +<div id="g-group-admin" class="g-block ui-helper-clearfix"> <a href="<?= url::site("admin/users/add_group_form") ?>" class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" title="<?= t("Create a new group")->for_html_attr() ?>"> |