Merge remote-tracking branch 'origin/master'

5fb14be3 · Weblate · df1ba7c9 · be15c11b · 5fb14be3
Commit 5fb14be3 authored Oct 27, 2015 by Weblate
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

weblate/accounts/admin.py weblate/accounts/admin.py +0 -1

No files found.
--- a/weblate/accounts/admin.py
+++ b/weblate/accounts/admin.py
@@ -52,7 +52,6 @@ class WeblateUserAdmin(UserAdmin):
    active.
    '''
    list_display = UserAdmin.list_display + ('is_active', 'user_groups', 'id')
-    list_filter = UserAdmin.list_filter + ('groups',)

    def user_groups(self, obj):
        """