Merge branch 'master' into staging

This commit is contained in:
Franz Pletz 2017-11-19 19:50:32 +01:00
commit 7faaade23e
No known key found for this signature in database
GPG key ID: 846FDED7792617B4

View file

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