diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-03-21 09:42:53 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-03-21 09:42:53 +0100 |
| commit | 8f8d486f35c8f1d290e3db2ba7ae42dcb380d1dd (patch) | |
| tree | fd4dd90a7f00dc7ffa3549889819bc1e1dbd53d2 /apps | |
| parent | 9848bc33e5b78aaf2fa07554fdd3c78d34ec0b67 (diff) | |
| parent | 19bbb61b20e1e9a7c7d4f9ef645ab65fcc453416 (diff) | |
| download | nextcloud-server-8f8d486f35c8f1d290e3db2ba7ae42dcb380d1dd.tar.gz nextcloud-server-8f8d486f35c8f1d290e3db2ba7ae42dcb380d1dd.zip | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/contacts/js/loader.js | 2 | ||||
| -rw-r--r-- | apps/files_texteditor/css/style.css | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js index eb59185d728..95fd7dc94ea 100644 --- a/apps/contacts/js/loader.js +++ b/apps/contacts/js/loader.js @@ -77,5 +77,7 @@ $(document).ready(function(){ if(typeof FileActions !== 'undefined'){ FileActions.register('text/vcard','importaddressbook', '', Contacts_Import.importdialog); FileActions.setDefault('text/vcard','importaddressbook'); + FileActions.register('text/x-vcard','importaddressbook', '', Contacts_Import.importdialog); + FileActions.setDefault('text/x-vcard','importaddressbook'); }; });
\ No newline at end of file diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css index e260ab0dd46..6a4392a08e9 100644 --- a/apps/files_texteditor/css/style.css +++ b/apps/files_texteditor/css/style.css @@ -5,7 +5,7 @@ left: 12.5em; } #editorwrapper{ - position: absoloute; + position: absolute; height: 0; width: 0; top: 41px; |