Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 7a3fd811b791ab5cf7787541832462f4e4bc35f4

Merge branch 'stable-3.1'

 server/lib/classes/cron.d/900-letsencrypt.inc.php

@@ -36,8 +36,8 @@
    public function onRunJob() {
        global $app, $conf;

        if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt-renewer")) {
            exec('/root/.local/share/letsencrypt/bin/letsencrypt-renewer');
        if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
            exec('/root/.local/share/letsencrypt/bin/letsencrypt renew');
        }
        
        parent::onRunJob();