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

Merge remote-tracking branch 'hydra/master' into x-updates 

Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
parents ba6c764a 8c4a613f
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