Ignore:
Timestamp:
Nov 18, 2011 1:16:22 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, search, security, server, social, storage, telecaster, test
Children:
54cb70b, 1ebbcd6
Parents:
ca09016 (diff), 1eb6b294 (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@…> (18/11/2011 13:16:22)
git-committer:
yomguy <yomguy@…> (18/11/2011 13:16:22)
Message:

Merge branch 'master' into crem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    r65bda9e r71026ba  
    218218    class Meta: 
    219219        model = MediaCollection 
     220    def clean_doctype_code(self): 
     221        return self.cleaned_data['doctype_code'] or 0 
    220222         
    221223 
Note: See TracChangeset for help on using the changeset viewer.