Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	apps/files/index.php

diff --cc apps/files/index.php
index 28ec1681fc6ad1cff71fc19165645ff165bdcb09,d46d8e32eefcce1cc08cd502a4b016bde1a63418..d9377550eb2c2308196c5eb1ac9ae22fbc3dfb8f
--- 1/apps/files/index.php
--- 2/apps/files/index.php
+++ b/apps/files/index.php
@@@ -153,6 -132,7 +132,9 @@@ if ($needUpgrade) 
        $tmpl->assign('isPublic', false);
        $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
        $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
 +      $tmpl->assign("mailNotificationEnabled", \OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
+       $tmpl->assign('disableSharing', false);
+       $tmpl->assign('ajaxLoad', $ajaxLoad);
++
        $tmpl->printPage();
  }

diff --cc apps/files/templates/index.php
Simple merge

diff --cc core/js/share.js
Simple merge

diff --cc lib/public/share.php
Simple merge

diff --cc lib/util.php
Simple merge