]> git.sur5r.net Git - i3/i3/commit
Merge pull request #3171 from i3/revert-3170-master-merge
authorIngo Bürk <admin@airblader.de>
Sat, 10 Mar 2018 20:48:14 +0000 (21:48 +0100)
committerGitHub <noreply@github.com>
Sat, 10 Mar 2018 20:48:14 +0000 (21:48 +0100)
commitc54f5008395b10c046f380cc3069ff779e5d2877
treebd61f14eb613bf2dd2242a0233ab06dfe71e0d4a
parent74c0e1b8664b11e5b1afb34501c03bcec43bfa2a
parent010e86605da30e03b8cc89a5418af48df5c76a0e
Merge pull request #3171 from i3/revert-3170-master-merge

Partially revert "Fix incorrect merge *sigh*"