Merge branch 'master' into harden
authorDaniel Schregenberger <daniel@despite.ch>
Mon, 22 Apr 2019 09:53:24 +0000 (11:53 +0200)
committerGitHub <noreply@github.com>
Mon, 22 Apr 2019 09:53:24 +0000 (11:53 +0200)
commite6e08d6159eb490798191ad2555277a33da59900
tree70ba15ce5ca56ebe2b254c1c75b0e0f2d3fc672e
parentfff184dca227d566c557a5431fe48dc1db9f2531
parentb9c268b847340b54204ee535bfc209599f856a00
Merge branch 'master' into harden
contrib/ympd.default
contrib/ympd.service