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
..
documentation	man-pages: 4.14 -> 4.15	2018-02-26 22:22:35 -08:00
fonts	fira-code: 1.204 -> 1.205	2018-02-27 20:37:33 -05:00
icons	hicolor-icon-theme: 0.15 -> 0.17	2018-02-25 12:53:06 -05:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
sgml+xml	docbook-xsl-ns: "revert" after parent commit	2018-01-30 19:49:44 +01:00
soundfonts/fluid