Merge branch 'master' into staging

fpletz · fpletz · commit 7faaade23e1d · 2017-11-19T19:50:32.000+01:00
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -3787,7 +3787,6 @@ with pkgs;
   owncloud = owncloud70;
 
   inherit (callPackages ../servers/owncloud { })
-    owncloud705
     owncloud70
     owncloud80
     owncloud81
