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
..
default.nix	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
fix-test-tz.patch	pytrainer: 1.11.0 -> 1.12.0	2018-02-27 22:21:38 +01:00
pytrainer-webkit.patch	Add package 'pytrainer'.	2015-01-18 13:34:02 +01:00