Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Marius Burkard

2016-04-20 c5c7a913f16f5ddbf4ff44d6db7bdfcd650cecaa

 interface/web/mail/xmpp_user_del.php

@@ -58,7 +58,8 @@
      $domain = $jid_parts[1];

        // check if domain is managed through mail domain
        $app->error('blubb');
        // if yes, manual deletion is not allowed
        //$app->error('blubb');


   }