]> jfr.im git - irc/freenode/web-7.0.git/commit
Merge branch 'master' into mockup
authorSvante B <redacted>
Tue, 23 Feb 2016 01:04:26 +0000 (01:04 +0000)
committerSvante B <redacted>
Tue, 23 Feb 2016 01:04:26 +0000 (01:04 +0000)
commit0e8c826fc800d06987747d0324d34874455b578c
tree8d659579f15dc3c452ff8fee5f316df4cd630f53
parent7a8140f6c1128e1e242c89ebafea52800d221423
parentcf1da5dc86c2e38c4db97886055731ed883223a6
Merge branch 'master' into mockup

Conflicts:
css/mock1.css
index_mock1.html