]> jfr.im git - irc/rizon/acid.git/commitdiff
Merge branch 'xmas2017-fixes' into 'master'
authorOrillion <redacted>
Mon, 27 Nov 2017 19:26:07 +0000 (19:26 +0000)
committerOrillion <redacted>
Mon, 27 Nov 2017 19:26:07 +0000 (19:26 +0000)
Xmas2017 fixes

Closes #25

See merge request rizon/acid!78


Trivial merge