diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-11-02 14:36:19 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-11-02 14:40:14 +0100 |
| commit | a92a2c8e158c1a67486e17063d04e448f25b865c (patch) | |
| tree | db7fac830d1fbd363ccaeecc300a2e492844f33d | |
| parent | a53bc2c2659d638982e15c6e981e447f5e88075f (diff) | |
| parent | 87e4e1ba72dafd0ea1208cd959d047c04612b4aa (diff) | |
Merge branch 'master' into staging
Conflict: rename of pythondaemon -> python-daemon.