]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
projects / thirdparty / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6458a0b 3f935d0)
Merge branch 'collectd-5.12' into main
authorFlorian Forster <octo@google.com>
Mon, 14 Sep 2020 07:54:48 +0000 (09:54 +0200)
committerFlorian Forster <octo@google.com>
Mon, 14 Sep 2020 07:54:48 +0000 (09:54 +0200)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
Mirror of https://github.com/collectd/collectd.git