]> jfr.im git - irc/freenode/web-7.0.git/commit
Merge branch 'templates'
authorEd Kellett <redacted>
Tue, 23 Feb 2016 17:46:09 +0000 (17:46 +0000)
committerEd Kellett <redacted>
Tue, 23 Feb 2016 17:46:09 +0000 (17:46 +0000)
commitdac2ec61f995ceaecf4ce1088d93f9749bc0f18f
tree92261728f31e6cc70ff007f2cfdc73400cb07b26
parentfcc25d01b7201834d89d403cdddd6d324f1ddd58
parent80a3778298a27733dd723b6b73dd5a684ff13e9e
Merge branch 'templates'

Conflicts:
index_mock1.html
static/css/mock1.css
static/css/style.css
index_mock1.html
static/css/mock1.css
static/css/style.css