From: Ray Strode <halfline@gmail.com>
Date: Sun, 11 Nov 2018 02:15:33 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.9.5~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=118c5ca1bc825ff5ff93029820e7badddb53dd6e;p=thirdparty%2Fplymouth.git

Merge branch 'master' into 'master'

systemd-units: Also add "ConditionVirtualization=!container" in…

See merge request plymouth/plymouth!8
---

118c5ca1bc825ff5ff93029820e7badddb53dd6e