Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-04-13 18:50:35 +02:00
9807 changed files with 28240 additions and 18640 deletions
+1 -1
View File
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Apache HTTPD, the world's most popular web server";
homepage = http://httpd.apache.org/;
homepage = "http://httpd.apache.org/";
license = licenses.asl20;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with maintainers; [ lovek323 peti ];