]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 May 2013 20:39:18 +0000 (22:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 May 2013 20:39:18 +0000 (22:39 +0200)
commit2461945e88228f85ff4e42d8085988e2c43bdd4d
tree27b6773b121482620dd340d3e144697c660f80fb
parent8da1e7b935fce1de9120b15aa00678a4bacbfa2e
parentdecc59185bfdc6d99b49c972e2f410eaaf101555
Merge branch 'dev' into crem2
telemeta/templates/telemeta/base.html