]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 21 May 2013 15:34:44 +0000 (17:34 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 21 May 2013 15:34:44 +0000 (17:34 +0200)
1  2 
telemeta/templates/telemeta/base.html

Simple merge