]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
projects / irc / freenode / web-7.0.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a8140f cf1da5d)
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)
Conflicts:
css/mock1.css
index_mock1.html


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.