]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem2' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 22:45:57 +0000 (23:45 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 8 Jan 2014 22:45:57 +0000 (23:45 +0100)
commitfd9ce03cc1c1e479c7a0df64fd524e8de9a2de8f
treefe48efe725597f75fe32d7d11d3afbd28bbfc849
parenta8b07f4ed7232e42e967dbd283cea1665c9d52c8
parentd0d2f282da8c3ab9b81a28ead3e4286d794eef76
Merge branch 'crem2' into diadems
telemeta/models/media.py