]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into sabiod
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 22 Jan 2014 22:10:48 +0000 (23:10 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 22 Jan 2014 22:10:48 +0000 (23:10 +0100)
1  2 
telemeta/templates/telemeta/base.html

Simple merge