From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 15 May 2020 18:25:34 +0000 (+0200)
Subject: Merge pull request #15817 from poettering/more-conditions
X-Git-Tag: v246-rc1~356
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18fbb567a8e6c576fed1a7a59822c4ef50922be9;p=thirdparty%2Fsystemd.git

Merge pull request #15817 from poettering/more-conditions

Add ConditionEnvironment= and ConditionIsEncrypted=
---

18fbb567a8e6c576fed1a7a59822c4ef50922be9