]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
Merge branch 'templates' of https://github.com/freenode/web-7.0.git into templates
authorSvante Bengtson <redacted>
Tue, 23 Feb 2016 12:12:46 +0000 (13:12 +0100)
committerSvante Bengtson <redacted>
Tue, 23 Feb 2016 12:12:46 +0000 (13:12 +0100)

Trivial merge