]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
projects / thirdparty / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6af454 0c85475)
Merge branch 'collectd-5.8'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 2 May 2018 10:27:01 +0000 (12:27 +0200)
Conflicts:
src/collectd.conf.pod

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