]> git.parisson.com Git - telemeta.git/commitdiff
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)
1  2 
telemeta/views/collection.py
telemeta/views/core.py

Simple merge
Simple merge