Skip to content
Commit 1c0d15b9 authored by Peter Simons's avatar Peter Simons
Browse files

Merge branch 'origin/master' into staging. 

Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
parents bb61b45d 2fc76ea0
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