diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-06 21:02:11 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-06 21:02:11 -0400 |
| commit | 9f04934d30625f5b1f3003367f219fa022552784 (patch) | |
| tree | a3ec2e6e03b170158e23bda4198fef61393c2adf /src/grp-resolve/systemd-resolved/resolved-dns-server.c | |
| parent | 3b135c1c790617110c588be29a02ede60cac69c6 (diff) | |
| parent | 96dd8e130ca135ce4c2f7c78391188a94b516e32 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/coredump/coredumpctl.c
# src/coredumpctl/coredumpctl.c
# src/systemd-coredump/coredumpctl.c
Diffstat (limited to 'src/grp-resolve/systemd-resolved/resolved-dns-server.c')
0 files changed, 0 insertions, 0 deletions