]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem2' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 14:18:47 +0000 (15:18 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 14:18:47 +0000 (15:18 +0100)
commit1bf282515db306998ad9644f9adc5fc963c002b8
treee356e186972a66f7997c121425a53ee78384abdd
parent1f29323eee0ebf05dc98fdd91fcb7d85048801ce
parentb806ed26d5c213e0153833d4f95f678c8efbdd8f
Merge branch 'crem2' into diadems

Conflicts:
telemeta/models/media.py
telemeta/models/media.py