]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem2' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Dec 2013 23:14:31 +0000 (00:14 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 30 Dec 2013 23:14:31 +0000 (00:14 +0100)
commit0da5abe01e668ee46d828f00aaf71e3f02cf3f55
tree49a5e68647fe00927a20b9b4ae5f88df00a1e0dd
parentfa4413c5da26085fb69e3f23936d2b9b703f7279
parentdb341e5de2769fa4c66584b29d9e1792bef0b261
Merge branch 'crem2' into diadems
telemeta/models/media.py
telemeta/views/item.py