Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
documentation	man-pages: 4.14 -> 4.15	2018-02-26 22:22:35 -08:00
fonts	iosevka: 1.14.0 -> 1.14.1	2018-03-08 20:05:47 -08:00
icons	numix-icon-theme-square: build GTK icon cache	2018-03-04 07:49:06 -03:00
misc	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
sgml+xml	docbook-xsl-ns: "revert" after parent commit	2018-01-30 19:49:44 +01:00
soundfonts/fluid	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00