]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authoryomguy <yomguy@parisson.com>
Mon, 11 Feb 2013 10:30:12 +0000 (11:30 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 11 Feb 2013 10:30:12 +0000 (11:30 +0100)
commitf298e2ba8fe5b5cdfafb3d830a75fbd3d4b9d4f3
tree07ba33f89ce75a21f657ede634b6a891cd1765c5
parent2137166cc980ef7ec540931f9effdaa301cc3f19
parent4a3a09f8a68761f654ed1403c50393b13b7b04d4
Merge branch 'dev' into crem2
telemeta/models/media.py