Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/tools/build-managers/conan/default.nix		2018-03-13 23:04:18 +02:00
..
generic.nix	ceph: Fix --with-file-aio logic for new meta.platforms and cross	2018-03-12 18:55:41 -04:00
mainline.nix	nginxMainline: 1.13.8 -> 1.13.9	2018-03-05 15:49:07 +01:00
mainline.upstream
modules.nix	nginx/modules: brotli: no-op bump to latest that uses 1.0.2 as submodule	2018-02-20 14:08:22 -06:00
stable.nix	nginx: 1.12.1 -> 1.12.2	2017-10-24 16:06:51 +02:00
stable.upstream