projects / systemd / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 286fe8e e302851)
Merge pull request #15268 from poettering/sigusr1-sigusr2
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 31 Mar 2020 13:32:28 +0000 (15:32 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 31 Mar 2020 13:33:05 +0000 (15:33 +0200)
Doing manual merge because github thinks there's a conflict.


Trivial merge
https://github.com/systemd/systemd.git