Ignore:
Timestamp:
03/21/12 14:44:33 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, security, server, social, storage, telecaster, test
Children:
30741ae
Parents:
86f7310 (diff), fabced9 (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/21/12 14:44:33)
git-committer:
yomguy <yomguy@…> (03/21/12 14:44:33)
Message:

Merge branch 'master' into dev

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    rc9f9871 rbf87cda  
    8888 
    8989class MediaBaseResource(MediaResource): 
    90     "Describe a base resource" 
     90    "Describe a media base resource" 
    9191 
    9292    title                 = CharField(_('title'), required=True) 
Note: See TracChangeset for help on using the changeset viewer.