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

Trivial merge