]> jfr.im git - irc/freenode/web-7.0.git/commit
Resolving merge issues
authorSvante Bengtson <redacted>
Tue, 23 Feb 2016 11:39:23 +0000 (12:39 +0100)
committerSvante Bengtson <redacted>
Tue, 23 Feb 2016 11:39:23 +0000 (12:39 +0100)
commite79d7ffd3e6ad856315052ec12ed2ae52802b71b
treeb454ebd2e4adf0778a45427ce981ab440be9b4a5
parent6be597830053c7086e83f103fd073b1f8212a9fe
Resolving merge issues
css/mock1.css