]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
Merge branch 'master' into footer-mob 107/head
authorJohn Dallahan <redacted>
Thu, 3 Mar 2016 08:35:31 +0000 (10:35 +0200)
committerJohn Dallahan <redacted>
Thu, 3 Mar 2016 08:35:31 +0000 (10:35 +0200)
1  2 
static/css/style.css
templates/index.html

Simple merge
Simple merge