]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'release-4.14'
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 4 Sep 2017 05:53:39 +0000 (07:53 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 4 Sep 2017 05:53:39 +0000 (07:53 +0200)

Trivial merge