]> git.parisson.com Git - telemeta.git/commit
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)
commit0cc5422739063cf5995feef4d0be463fca81bdf2
tree9509cd63c5ce6c4cdae94e568d79e09449eb3ae6
parentb8639209e4f3b07c4f0efadb4af62e4f17cad22d
parent49ee16320488ab50fc1f9bdc7e91f5b3e78a89b9
Merge branch 'dev' into sabiod
telemeta/templates/telemeta/base.html