Skip to content
Commit 1047ed49 authored by obadz's avatar obadz
Browse files

Merge branch 'master' into staging 

Conflicts: pkgs/os-specific/linux/kmod/default.nix cc @abbradar
parents 3e03db11 80dbdba6
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