Tuomas Tynkkynen
6ed0fe7e45
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/build-support/fetchbower/default.nix
pkgs/build-support/fetchdarcs/default.nix
pkgs/build-support/fetchgx/default.nix
pkgs/development/python-modules/botocore/default.nix
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
pkgs/tools/admin/awscli/default.nix
2018-01-14 21:18:27 +02:00
..
2017-12-12 04:58:45 -06:00
2018-01-09 15:03:03 +01:00
2018-01-06 13:53:23 +01:00
2017-12-12 04:58:45 -06:00
2018-01-09 15:03:03 +01:00
2018-01-14 21:18:27 +02:00
2017-12-12 04:58:45 -06:00