projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6be2af8 ba60ec0)
Auto-Merge pull request #2950 from octo/ff/wireless
authorcollectd bot <32910397+collectd-bot@users.noreply.github.com>
Fri, 12 Oct 2018 16:18:26 +0000 (18:18 +0200)
committerGitHub <noreply@github.com>
Fri, 12 Oct 2018 16:18:26 +0000 (18:18 +0200)
Automatically merged due to "Automerge" label


Trivial merge
collectd, the system statistics collection daemon