Skip to content
Commit aadaa913 authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen
Browse files

Merge remote-tracking branch 'upstream/master' into staging 

Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
parents 2362891d e7d31666
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