@conflict roundcubemail-<1.6
roundcubemail/skins/classic/
roundcubemail/skins/classic/README.md
roundcubemail/skins/classic/addressbook.css
roundcubemail/skins/classic/addressbook.min.css
roundcubemail/skins/classic/bin/
roundcubemail/skins/classic/bin/build.sh
roundcubemail/skins/classic/bin/cssimages.sh
roundcubemail/skins/classic/bin/cssshrink.sh
roundcubemail/skins/classic/bin/jsshrink.sh
roundcubemail/skins/classic/common.css
roundcubemail/skins/classic/common.min.css
roundcubemail/skins/classic/composer.json
roundcubemail/skins/classic/embed.css
roundcubemail/skins/classic/embed.min.css
roundcubemail/skins/classic/functions.js
roundcubemail/skins/classic/functions.min.js
roundcubemail/skins/classic/googiespell.css
roundcubemail/skins/classic/googiespell.min.css
roundcubemail/skins/classic/images/
roundcubemail/skins/classic/images/abook_toolbar.png
roundcubemail/skins/classic/images/buttons/
roundcubemail/skins/classic/images/buttons/add_act.png
roundcubemail/skins/classic/images/buttons/add_pas.png
roundcubemail/skins/classic/images/buttons/add_sel.png
roundcubemail/skins/classic/images/buttons/bg.gif
roundcubemail/skins/classic/images/cleardot.png
roundcubemail/skins/classic/images/contactactions.png
roundcubemail/skins/classic/images/contactgroup.png
roundcubemail/skins/classic/images/contactpic.png
roundcubemail/skins/classic/images/dbutton.png
roundcubemail/skins/classic/images/dimple.png
roundcubemail/skins/classic/images/display/
roundcubemail/skins/classic/images/display/icons.gif
roundcubemail/skins/classic/images/display/icons.png
roundcubemail/skins/classic/images/display/loading.gif
roundcubemail/skins/classic/images/display/loading_blue.gif
roundcubemail/skins/classic/images/favicon.ico
roundcubemail/skins/classic/images/filedrop.png
roundcubemail/skins/classic/images/googiespell/
roundcubemail/skins/classic/images/googiespell/change_lang.gif
roundcubemail/skins/classic/images/googiespell/indicator.gif
roundcubemail/skins/classic/images/googiespell/ok.gif
roundcubemail/skins/classic/images/googiespell/spellc.gif
roundcubemail/skins/classic/images/icons/
roundcubemail/skins/classic/images/icons/attachment.png
roundcubemail/skins/classic/images/icons/blank.gif
roundcubemail/skins/classic/images/icons/collapsed.png
roundcubemail/skins/classic/images/icons/columnpicker.gif
roundcubemail/skins/classic/images/icons/delete.png
roundcubemail/skins/classic/images/icons/deleted.png
roundcubemail/skins/classic/images/icons/dot.png
roundcubemail/skins/classic/images/icons/down_small.gif
roundcubemail/skins/classic/images/icons/expanded.png
roundcubemail/skins/classic/images/icons/extwin.png
roundcubemail/skins/classic/images/icons/flagged.png
roundcubemail/skins/classic/images/icons/folders.png
roundcubemail/skins/classic/images/icons/forwarded.png
roundcubemail/skins/classic/images/icons/forwarded_replied.png
roundcubemail/skins/classic/images/icons/glass.png
roundcubemail/skins/classic/images/icons/glass_roll.png
roundcubemail/skins/classic/images/icons/groupactions.png
roundcubemail/skins/classic/images/icons/html.png
roundcubemail/skins/classic/images/icons/minus.gif
roundcubemail/skins/classic/images/icons/plus.gif
roundcubemail/skins/classic/images/icons/rename.png
roundcubemail/skins/classic/images/icons/replied.png
roundcubemail/skins/classic/images/icons/reset.gif
roundcubemail/skins/classic/images/icons/silhouette.png
roundcubemail/skins/classic/images/icons/sort.gif
roundcubemail/skins/classic/images/icons/text.png
roundcubemail/skins/classic/images/icons/unflagged.png
roundcubemail/skins/classic/images/icons/unread.png
roundcubemail/skins/classic/images/icons/unread_children.png
roundcubemail/skins/classic/images/icons/up_small.gif
roundcubemail/skins/classic/images/listheader.gif
roundcubemail/skins/classic/images/mail_footer.png
roundcubemail/skins/classic/images/mail_toolbar.png
roundcubemail/skins/classic/images/messageactions.png
roundcubemail/skins/classic/images/messageicons.png
roundcubemail/skins/classic/images/pagenav.gif
roundcubemail/skins/classic/images/quota-colors.png
roundcubemail/skins/classic/images/quota.png
roundcubemail/skins/classic/images/roundcube_logo.png
roundcubemail/skins/classic/images/searchfield.gif
roundcubemail/skins/classic/images/tabs-left.gif
roundcubemail/skins/classic/images/tabs-right.gif
roundcubemail/skins/classic/images/taskbar.png
roundcubemail/skins/classic/images/taskicons.gif
roundcubemail/skins/classic/images/taskicons.png
roundcubemail/skins/classic/images/tree.gif
roundcubemail/skins/classic/images/watermark.gif
roundcubemail/skins/classic/includes/
roundcubemail/skins/classic/includes/header.html
roundcubemail/skins/classic/includes/links.html
roundcubemail/skins/classic/includes/messagetoolbar.html
roundcubemail/skins/classic/includes/settingstabs.html
roundcubemail/skins/classic/includes/taskbar.html
roundcubemail/skins/classic/mail.css
roundcubemail/skins/classic/mail.min.css
roundcubemail/skins/classic/meta.json
roundcubemail/skins/classic/plugins/
roundcubemail/skins/classic/plugins/acl/
roundcubemail/skins/classic/plugins/acl/acl.css
roundcubemail/skins/classic/plugins/acl/acl.min.css
roundcubemail/skins/classic/plugins/acl/images/
roundcubemail/skins/classic/plugins/acl/images/enabled.png
roundcubemail/skins/classic/plugins/acl/images/partial.png
roundcubemail/skins/classic/plugins/acl/templates/
roundcubemail/skins/classic/plugins/acl/templates/table.html
roundcubemail/skins/classic/plugins/archive/
roundcubemail/skins/classic/plugins/archive/archive.css
roundcubemail/skins/classic/plugins/archive/archive.min.css
roundcubemail/skins/classic/plugins/archive/archive_act.png
roundcubemail/skins/classic/plugins/archive/archive_pas.png
roundcubemail/skins/classic/plugins/archive/foldericon.png
roundcubemail/skins/classic/plugins/enigma/
roundcubemail/skins/classic/plugins/enigma/enigma.css
roundcubemail/skins/classic/plugins/enigma/enigma.min.css
roundcubemail/skins/classic/plugins/enigma/enigma.png
roundcubemail/skins/classic/plugins/enigma/enigma_error.png
roundcubemail/skins/classic/plugins/enigma/key.png
roundcubemail/skins/classic/plugins/enigma/key_add.png
roundcubemail/skins/classic/plugins/enigma/keys_toolbar.png
roundcubemail/skins/classic/plugins/enigma/templates/
roundcubemail/skins/classic/plugins/enigma/templates/keycreate.html
roundcubemail/skins/classic/plugins/enigma/templates/keyimport.html
roundcubemail/skins/classic/plugins/enigma/templates/keyinfo.html
roundcubemail/skins/classic/plugins/enigma/templates/keys.html
roundcubemail/skins/classic/plugins/enigma/templates/keysearch.html
roundcubemail/skins/classic/plugins/help/
roundcubemail/skins/classic/plugins/help/help.css
roundcubemail/skins/classic/plugins/help/help.gif
roundcubemail/skins/classic/plugins/help/help.min.css
roundcubemail/skins/classic/plugins/help/templates/
roundcubemail/skins/classic/plugins/help/templates/content.html
roundcubemail/skins/classic/plugins/help/templates/help.html
roundcubemail/skins/classic/plugins/jqueryui/
roundcubemail/skins/classic/plugins/jqueryui/images/
roundcubemail/skins/classic/plugins/jqueryui/images/buttongradient.png
roundcubemail/skins/classic/plugins/jqueryui/images/listheader.png
roundcubemail/skins/classic/plugins/jqueryui/images/ui-icons_444444_256x240.png
roundcubemail/skins/classic/plugins/jqueryui/images/ui-icons_555555_256x240.png
roundcubemail/skins/classic/plugins/jqueryui/images/ui-icons_777620_256x240.png
roundcubemail/skins/classic/plugins/jqueryui/images/ui-icons_777777_256x240.png
roundcubemail/skins/classic/plugins/jqueryui/images/ui-icons_cc0000_256x240.png
roundcubemail/skins/classic/plugins/jqueryui/images/ui-icons_ffffff_256x240.png
roundcubemail/skins/classic/plugins/jqueryui/jquery-ui.css
roundcubemail/skins/classic/plugins/jqueryui/jquery-ui.css.diff
roundcubemail/skins/classic/plugins/jqueryui/jquery-ui.min.css
roundcubemail/skins/classic/plugins/jqueryui/jquery.minicolors.css
roundcubemail/skins/classic/plugins/jqueryui/jquery.minicolors.min.css
roundcubemail/skins/classic/plugins/jqueryui/tagedit.css
roundcubemail/skins/classic/plugins/jqueryui/tagedit.min.css
roundcubemail/skins/classic/plugins/managesieve/
roundcubemail/skins/classic/plugins/managesieve/images/
roundcubemail/skins/classic/plugins/managesieve/images/add.png
roundcubemail/skins/classic/plugins/managesieve/images/del.png
roundcubemail/skins/classic/plugins/managesieve/images/down_small.gif
roundcubemail/skins/classic/plugins/managesieve/images/erase.png
roundcubemail/skins/classic/plugins/managesieve/images/filter.png
roundcubemail/skins/classic/plugins/managesieve/images/up_small.gif
roundcubemail/skins/classic/plugins/managesieve/managesieve.css
roundcubemail/skins/classic/plugins/managesieve/managesieve.min.css
roundcubemail/skins/classic/plugins/managesieve/managesieve_mail.css
roundcubemail/skins/classic/plugins/managesieve/managesieve_mail.min.css
roundcubemail/skins/classic/plugins/managesieve/templates/
roundcubemail/skins/classic/plugins/managesieve/templates/filteredit.html
roundcubemail/skins/classic/plugins/managesieve/templates/forward.html
roundcubemail/skins/classic/plugins/managesieve/templates/managesieve.html
roundcubemail/skins/classic/plugins/managesieve/templates/setedit.html
roundcubemail/skins/classic/plugins/managesieve/templates/seteditraw.html
roundcubemail/skins/classic/plugins/managesieve/templates/vacation.html
roundcubemail/skins/classic/plugins/markasjunk/
roundcubemail/skins/classic/plugins/markasjunk/images/
roundcubemail/skins/classic/plugins/markasjunk/images/mail_toolbar.png
roundcubemail/skins/classic/plugins/markasjunk/images/messageactions.png
roundcubemail/skins/classic/plugins/markasjunk/markasjunk.css
roundcubemail/skins/classic/plugins/markasjunk/markasjunk.min.css
roundcubemail/skins/classic/plugins/vcard_attachments/
roundcubemail/skins/classic/plugins/vcard_attachments/style.css
roundcubemail/skins/classic/plugins/vcard_attachments/style.min.css
roundcubemail/skins/classic/plugins/vcard_attachments/vcard.png
roundcubemail/skins/classic/plugins/vcard_attachments/vcard_add_contact.png
roundcubemail/skins/classic/plugins/zipdownload/
roundcubemail/skins/classic/plugins/zipdownload/zip.png
roundcubemail/skins/classic/plugins/zipdownload/zipdownload.css
roundcubemail/skins/classic/plugins/zipdownload/zipdownload.min.css
roundcubemail/skins/classic/print.css
roundcubemail/skins/classic/print.min.css
roundcubemail/skins/classic/safari.css
roundcubemail/skins/classic/safari.min.css
roundcubemail/skins/classic/settings.css
roundcubemail/skins/classic/settings.min.css
roundcubemail/skins/classic/splitter.js
roundcubemail/skins/classic/splitter.min.js
roundcubemail/skins/classic/templates/
roundcubemail/skins/classic/templates/about.html
roundcubemail/skins/classic/templates/addressbook.html
roundcubemail/skins/classic/templates/bounce.html
roundcubemail/skins/classic/templates/compose.html
roundcubemail/skins/classic/templates/contact.html
roundcubemail/skins/classic/templates/contactadd.html
roundcubemail/skins/classic/templates/contactedit.html
roundcubemail/skins/classic/templates/contactprint.html
roundcubemail/skins/classic/templates/contactsearch.html
roundcubemail/skins/classic/templates/error.html
roundcubemail/skins/classic/templates/folderedit.html
roundcubemail/skins/classic/templates/folders.html
roundcubemail/skins/classic/templates/identities.html
roundcubemail/skins/classic/templates/identityedit.html
roundcubemail/skins/classic/templates/importcontacts.html
roundcubemail/skins/classic/templates/login.html
roundcubemail/skins/classic/templates/mail.html
roundcubemail/skins/classic/templates/message.html
roundcubemail/skins/classic/templates/messageerror.html
roundcubemail/skins/classic/templates/messagepart.html
roundcubemail/skins/classic/templates/messagepreview.html
roundcubemail/skins/classic/templates/messageprint.html
roundcubemail/skins/classic/templates/plugin.html
roundcubemail/skins/classic/templates/responseedit.html
roundcubemail/skins/classic/templates/responses.html
roundcubemail/skins/classic/templates/settings.html
roundcubemail/skins/classic/templates/settingsedit.html
roundcubemail/skins/classic/thumbnail.png
roundcubemail/skins/classic/watermark.html