diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-22 17:59:39 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-22 17:59:39 +0200 |
| commit | 9e1016f7d2aa7c23fc6287a563e6551809edcbe8 (patch) | |
| tree | 2ec3b29c78b88581aa12df4bee3262fee939907d /apps/files_encryption/js | |
| parent | fed1792510ff11941765783653573f45fadc4c70 (diff) | |
| parent | 02b2b5a808b135007d8d54b837e70c38f02729fd (diff) | |
| download | nextcloud-server-9e1016f7d2aa7c23fc6287a563e6551809edcbe8.tar.gz nextcloud-server-9e1016f7d2aa7c23fc6287a563e6551809edcbe8.zip | |
Merge branch 'master' into fixing-4343-master
Conflicts:
lib/connector/sabre/quotaplugin.php
Diffstat (limited to 'apps/files_encryption/js')
| -rw-r--r-- | apps/files_encryption/js/settings-admin.js | 2 | ||||
| -rw-r--r-- | apps/files_encryption/js/settings-personal.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js index 7c1866445ee..6647c621e7b 100644 --- a/apps/files_encryption/js/settings-admin.js +++ b/apps/files_encryption/js/settings-admin.js @@ -99,4 +99,4 @@ $(document).ready(function(){ ); }); -});
\ No newline at end of file +}); diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js index d6535a25b70..e16519c3c98 100644 --- a/apps/files_encryption/js/settings-personal.js +++ b/apps/files_encryption/js/settings-personal.js @@ -95,4 +95,4 @@ $(document).ready(function(){ updatePrivateKeyPasswd(); }); -});
\ No newline at end of file +}); |