Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 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();