]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem2' into dev2
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 May 2013 09:27:49 +0000 (11:27 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 May 2013 09:27:49 +0000 (11:27 +0200)
commit56cafc036082a7e819dafc56555c2a4207b7b0c9
tree18c59781130c12d7dbb97adc797c2a0367c1debd
parente2f40c9ab3f8ccd5f8bd991763c4c381065e33bb
parent0ff47b4ee3804e3ccdec0f4e8adf2ad01cc842b3
Merge branch 'crem2' into dev2
telemeta/views/collection.py
telemeta/views/core.py