Skip to content
Verified Commit 24a99fc4 authored by Joerg Jaspert's avatar Joerg Jaspert
Browse files

Merge branch 'master' into deploy 

* master:
  Fixup lock_fd
parents a1ec2715 095f5d4d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment