]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:47:06 +0000 (17:47 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:47:06 +0000 (17:47 +0100)
commit3da234d39057fa83baa3352b58c2f428e3ea1ebb
tree460f5ec53f642df36fe1b6e08e9982b7d92f0a19
parente2ce48ce5a4153d0e87750d19e7d3137e9155739
parentc8a94dc7b509ecc556ded568f9464121865217b9
Merge branch 'crem' into diadems

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