Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
..
2018-02-24 15:05:54 -08:00
2017-07-13 23:03:40 +02:00
2017-11-28 08:39:02 +00:00
2018-01-31 23:32:49 +01:00
2017-01-31 07:54:36 -06:00
2017-10-23 11:12:38 +03:00
2018-02-27 06:09:21 -08:00
2017-12-25 14:43:58 +02:00
2016-07-28 17:16:37 -07:00
2016-08-26 16:24:43 +03:00
2017-01-26 03:52:49 +01:00
2017-11-26 18:22:12 +08:00