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-30 06:58:05 -02:00
2017-12-17 02:54:24 +01:00
2018-01-08 17:36:11 +01:00
2017-12-30 22:04:22 -05:00
2017-11-30 16:23:59 -02:00
2018-01-05 20:42:46 +01:00
2018-01-12 10:24:36 -02:00
2018-01-10 09:40:42 -02:00
2017-09-07 12:51:21 +02:00
2017-12-22 23:31:54 +01:00
2018-01-02 23:35:51 +01:00
2017-09-21 15:49:53 -04:00
2017-12-20 00:40:26 +03:00