]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' into wip
authorJérémy Fabre <blackmagik88@gmail.com>
Tue, 12 Jul 2016 14:27:04 +0000 (16:27 +0200)
committerJérémy Fabre <blackmagik88@gmail.com>
Tue, 12 Jul 2016 14:27:04 +0000 (16:27 +0200)
commit92110820b76bd82ae56135acd71669a21437abbe
treef88cad0c6f876c26919f3d863a5f4135efa603b3
parent70388ac9a1bbc85291e6681bc5f1513250c07e86
parent67a011c68aab87ca445255a66adacf2b6c51e67b
Merge branch 'dev' into wip
app/templates/base.html