diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
| commit | edb04b25dea733e0ac3a1f87c55cfd368dcdf731 (patch) | |
| tree | e8b951b8162955d7f2282c83d06cf803e61396f3 /apps/files_encryption/js/settings.js | |
| parent | 7de97ed20003d1f5ab9e2bfde9386bba07d0eff8 (diff) | |
| parent | b3848581bf5f77008a71cf79ba6e3d61b33baed6 (diff) | |
| download | nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.tar.gz nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.zip | |
Fix merge conflicts
Diffstat (limited to 'apps/files_encryption/js/settings.js')
| -rw-r--r-- | apps/files_encryption/js/settings.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js index 37d62265c94..8cc433246cb 100644 --- a/apps/files_encryption/js/settings.js +++ b/apps/files_encryption/js/settings.js @@ -17,8 +17,8 @@ $(document).ready(function(){ OC.AppConfig.setValue('files_encryption','type_blacklist',blackList); } - $('#enbale_encryption').change(function(){ - var checked=$('#enbale_encryption').is(':checked'); + $('#enable_encryption').change(function(){ + var checked=$('#enable_encryption').is(':checked'); OC.AppConfig.setValue('files_encryption','enable_encryption',(checked)?'true':'false'); }) })
\ No newline at end of file |