Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

5 files changed, 10 insertions, 0 deletions

diff --git a/plugins/archive/skins/classic/archive.css b/plugins/archive/skins/classic/archive.css
new file mode 100644
index 000000000..fc5984b39
--- /dev/null
+++ b/plugins/archive/skins/classic/archive.css
@@ -0,0 +1,10 @@
+
+#messagetoolbar a.button.archive {
+	text-indent: -5000px;
+	background: url(archive_act.png) 0 0 no-repeat;
+}
+
+#mailboxlist li.mailbox.archive > a {
+	background-image: url(foldericon.png);
+	background-position: 5px 1px;
+}
diff --git a/plugins/archive/skins/classic/archive_act.png b/plugins/archive/skins/classic/archive_act.png
new file mode 100644
index 000000000..2a1735868
--- /dev/null
+++ b/plugins/archive/skins/classic/archive_act.png
diff --git a/plugins/archive/skins/classic/archive_pas.png b/plugins/archive/skins/classic/archive_pas.png
new file mode 100644
index 000000000..8de208583
--- /dev/null
+++ b/plugins/archive/skins/classic/archive_pas.png
diff --git a/plugins/archive/skins/classic/foldericon.png b/plugins/archive/skins/classic/foldericon.png
new file mode 100644
index 000000000..ec0853c44
--- /dev/null
+++ b/plugins/archive/skins/classic/foldericon.png
diff --git a/plugins/archive/skins/larry/.gitignore b/plugins/archive/skins/larry/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/plugins/archive/skins/larry/.gitignore