Tuomas Tynkkynen 16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
2018-04-16 21:13:30 +03:00
..
2018-03-19 21:42:25 +03:00
2017-10-15 21:21:20 -07:00
2017-12-27 22:59:40 +01:00
2018-04-06 10:57:19 +02:00
2017-08-09 07:32:21 +01:00
2018-01-21 22:38:55 -07:00
2017-04-01 21:24:08 -05:00
2017-03-14 21:01:10 +01:00
2018-03-08 08:56:24 -08:00
2018-03-08 09:27:03 -08:00
2017-08-01 20:51:16 +02:00
2018-02-03 23:58:39 +00:00
2018-03-29 08:53:42 -07:00
2017-04-01 02:19:51 +00:00
2018-02-27 17:04:37 -08:00
2018-02-25 12:24:35 +01:00
2018-02-28 11:53:26 +01:00