Merge branch 'master' into staging

This commit is contained in:
Franz Pletz
2017-11-19 19:50:32 +01:00

View File

@@ -3787,7 +3787,6 @@ with pkgs;
owncloud = owncloud70;
inherit (callPackages ../servers/owncloud { })
owncloud705
owncloud70
owncloud80
owncloud81