]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 21 May 2013 15:25:27 +0000 (17:25 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 21 May 2013 15:25:27 +0000 (17:25 +0200)
commitaca5a714ab74fa5c0480756ff259f554164591ff
tree2bd167d8a6762a45a5e51c4f524b82b4b2ce12cb
parent26023550472e807a9ed49fe684c08696aa56cf88
parent67ba579184181f5a0a01fd6dea1588bb0fd8cf3f
Merge branch 'dev' into crem2
telemeta/templates/telemeta/base.html