Merge pull request #10594 from poettering/env-reload-fix
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 7 Nov 2018 11:49:13 +0000 (12:49 +0100)
committerGitHub <noreply@github.com>
Wed, 7 Nov 2018 11:49:13 +0000 (12:49 +0100)
change handling of environment block of PID1's manager object

1  2 
src/basic/time-util.c
src/core/main.c
src/shared/ask-password-api.c

Simple merge
diff --cc src/core/main.c
Simple merge
Simple merge