Changeset f83d820 for telemeta/admin.py

Timestamp:

03/22/12 02:42:59 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

5a09eb7

Parents:

40fcc15 (diff), bfa68c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (03/22/12 02:42:59)

git-committer:

yomguy <yomguy@…> (03/22/12 02:42:59)

Message:

Merge branch 'master' into security

Conflicts:

telemeta/admin.py
telemeta/models/system.py

File:

• telemeta/admin.py (modified) (2 diffs)

telemeta/admin.py

@@ -6 +6 @@
 from telemeta.models.system import *
 from django.contrib import admin
+<<<<<<< HEAD
 from django.forms import CheckboxSelectMultiple
+=======
+>>>>>>> master
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin
@@ -21 +24 @@
     ordering = ['code']
     filter_horizontal = ['children']
-    
+
 class MediaCollectionAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']