]> git.0d.be Git - panikweb.git/commit
Merge branch 'master' into wip/three-columns
authorFrédéric Péters <fpeters@0d.be>
Fri, 27 Sep 2013 19:18:38 +0000 (21:18 +0200)
committerFrédéric Péters <fpeters@0d.be>
Fri, 27 Sep 2013 19:18:38 +0000 (21:18 +0200)
commite9f36ce8f200e8ddf62b93e35bca2ce8cb149f16
tree4393f5b67b7ffac92b69d72b2d63c761d6d62992
parent9c61b391a30a7ddbee20ca53931955d71945d114
parent4dbebfed8ac8a3c2136185c8a02899bcbfcadc8f
Merge branch 'master' into wip/three-columns

Conflicts:
panikweb_templates/templates/home.html
panikweb_templates/templates/news.html
panikweb_templates/templates/news/roll.html
panikweb_templates/static/css/specifics.css
panikweb_templates/templates/base.html
panikweb_templates/templates/home.html
panikweb_templates/templates/includes/player.html
panikweb_templates/templates/news.html