diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 22:15:36 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 22:15:36 -0400 |
commit | 72ed41b8e7502fc5d416d4d9b6317e9ab3faaa47 (patch) | |
tree | bf7bbb790417040aaecccf0b137ba877211b5133 /src/grp-journal-remote/systemd-journal-upload/journal-upload.c | |
parent | e16e20038bff3a72fb14c3fac8a923dc6a7be327 (diff) | |
parent | 916bb2b5eb5b5f03abaeb3563336d75e36bcb23d (diff) |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/libbasic/Makefile
Diffstat (limited to 'src/grp-journal-remote/systemd-journal-upload/journal-upload.c')
0 files changed, 0 insertions, 0 deletions