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

Merge branch 'staging' 

Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
parents f203b32b c73f0cae
Expand all 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