]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
Merge branch 'design' of github.com:freenode/web-7.0 into design
authorSvante Bengtson <redacted>
Tue, 23 Feb 2016 18:28:16 +0000 (19:28 +0100)
committerSvante Bengtson <redacted>
Tue, 23 Feb 2016 18:28:16 +0000 (19:28 +0100)

Trivial merge