]> git.parisson.com Git - telemeta.git/commit
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)
commitd6ee4cbb5deb7ff97eceb31b0440e82ef0057da5
treef9169f176b94260ae0fd041a5a58c6d7c4d95c5d
parentaca5a714ab74fa5c0480756ff259f554164591ff
parent00ce18522bfc64a23a545fce2655ce49a21b0629
Merge branch 'dev' into crem2
telemeta/templates/telemeta/base.html