]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem2' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 12:10:05 +0000 (13:10 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 12:10:05 +0000 (13:10 +0100)
commit1f29323eee0ebf05dc98fdd91fcb7d85048801ce
tree891196cd9f6a65e5ca11255068f4121f83f9d7a4
parentfd9ce03cc1c1e479c7a0df64fd524e8de9a2de8f
parentdafd447d59d70d85de945a410d1fb95fb6a642bd
Merge branch 'crem2' into diadems
telemeta/models/media.py