Skip to content
Commit a7f91d75 authored by Pascal Wittmann's avatar Pascal Wittmann
Browse files

Merge branch 'master' of github.com:NixOS/nixpkgs

parents 116c230e 54e0a9b7
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