Skip to content
Unverified Commit a92a2c8e authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging 

Conflict: rename of pythondaemon -> python-daemon.
parents a53bc2c2 87e4e1ba
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment