diff options
author | Marco Maggesi <1809783+maggesi@users.noreply.github.com> | 2019-10-07 16:04:15 +0200 |
---|---|---|
committer | Marco Maggesi <1809783+maggesi@users.noreply.github.com> | 2019-10-07 16:04:15 +0200 |
commit | 2b05a35e08a4ff732f037b67ade05c063ef0c5ce (patch) | |
tree | 811ab5c8fb4b5eaa70eb5171d08a40b6cc0c4e91 | |
parent | c70d7fa7603c7c4ea64211dd2be5995a55310245 (diff) | |
parent | 520a658b26e169d43caad9d488eb3dd4576e80d9 (diff) |
Merge branch 'master' of github.com:NixOS/nixpkgs