diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
commit | a34579e01ef2aca4b33381a5c189746a1b52e2f0 (patch) | |
tree | 70410891f5c55611a2d17d2d723f270ad022c391 /pkgs/os-specific/linux/util-linux | |
parent | af8cd3c74e80ff532b17568039ecc4f143992813 (diff) | |
parent | 40dea2488fec71f6224944c1b9dae280c2fcc2dc (diff) | |
download | nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.gz nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.bz2 nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.lz nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.xz nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.zst nixpkgs-a34579e01ef2aca4b33381a5c189746a1b52e2f0.zip |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/tools/networking/network-manager/fortisslvpn.nix
Diffstat (limited to 'pkgs/os-specific/linux/util-linux')
0 files changed, 0 insertions, 0 deletions