aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/files.js
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-04-22 12:25:49 +0200
committerRobin Appelman <icewind@owncloud.com>2014-04-22 12:25:49 +0200
commit3821a0968950c7320ed9bfa60a5c347060eaff0a (patch)
tree9b428cf0bb01e4c392d3ee7b194c6b81a459617d /apps/files/js/files.js
parent295b75cca91273c7145379cc479fa84ac14c8dd1 (diff)
parentd56072cf2ed07069fe8060af47d8f752590d1f8a (diff)
downloadnextcloud-server-3821a0968950c7320ed9bfa60a5c347060eaff0a.tar.gz
nextcloud-server-3821a0968950c7320ed9bfa60a5c347060eaff0a.zip
merge master into webdav-injection
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r--apps/files/js/files.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index ac10191618b..9f38263bef3 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -135,7 +135,7 @@ var Files = {
return;
}
if (initStatus === '1') { // encryption tried to init but failed
- OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
+ OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
return;
}
if (encryptedFiles === '1') {