Changeset bf87cda for telemeta/models/media.py

Timestamp:

03/21/12 14:44:33 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, instru_search, lam, nlivemulti, release/1.4.4, security, social, storage, 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:

• telemeta/models/media.py (modified) (1 diff)

telemeta/models/media.py

@@ -88 +88 @@
 
 class MediaBaseResource(MediaResource):
-    "Describe a base resource"
+    "Describe a media base resource"
 
     title                 = CharField(_('title'), required=True)