Changeset f83d820 for telemeta/admin.py


Ignore:
Timestamp:
Mar 22, 2012 2:42:59 AM (3 years 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@…> (22/03/2012 02:42:59)
git-committer:
yomguy <yomguy@…> (22/03/2012 02:42:59)
Message:

Merge branch 'master' into security

Conflicts:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/admin.py

    rf6b65e4 rf83d820  
    66from telemeta.models.system import * 
    77from django.contrib import admin 
     8<<<<<<< HEAD 
    89from django.forms import CheckboxSelectMultiple 
     10======= 
     11>>>>>>> master 
    912from django.contrib.auth.models import User 
    1013from django.contrib.auth.admin import UserAdmin 
     
    2124    ordering = ['code'] 
    2225    filter_horizontal = ['children'] 
    23      
     26 
    2427class MediaCollectionAdmin(admin.ModelAdmin): 
    2528    search_fields = ['title', 'code'] 
Note: See TracChangeset for help on using the changeset viewer.