]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 6 Jan 2014 15:52:28 +0000 (16:52 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 6 Jan 2014 15:52:28 +0000 (16:52 +0100)
commita2cac8f1b6954e7d91c13d013e12f4fd27a635d0
tree7288947dea9b95a48b6ac9ef30fc3e5a98356774
parent80aedd4e784df639928f6b8afed2673bfcfecb93
parent54e27d52d5bc47b6016fa33a7f2772c93f829c28
Merge branch 'dev' into crem2
telemeta/models/media.py