]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 May 2013 20:21:10 +0000 (22:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 May 2013 20:21:10 +0000 (22:21 +0200)
commit8da1e7b935fce1de9120b15aa00678a4bacbfa2e
treeaa4113df63e93a9c813307ba1811aedd4be8e470
parent0ff47b4ee3804e3ccdec0f4e8adf2ad01cc842b3
parent16e62e79f71bf65b4700aa5266bc140a114654c6
Merge branch 'dev' into crem2
telemeta/views/collection.py
telemeta/views/core.py