summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorRichard Beales <[email protected]>2013-03-20 07:26:49 +0000
committerRichard Beales <[email protected]>2013-03-20 07:26:49 +0000
commit04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (patch)
tree5c00a04297478b8b6550c677d8799c404a0fddd7 /plugins
parent598a8f37a2ce94186166d1c3b22cc65efdebe4a4 (diff)
parent54bc5594ab26ae961bb92c113a1d2815044e450f (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mailto/mail.pngbin192 -> 254 bytes
-rw-r--r--plugins/updater/init.php1
2 files changed, 1 insertions, 0 deletions
diff --git a/plugins/mailto/mail.png b/plugins/mailto/mail.png
index 4d3fe7751..fcdcbd604 100644
--- a/plugins/mailto/mail.png
+++ b/plugins/mailto/mail.png
Binary files differ
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index 4f9ee86bd..6c31501ed 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -230,6 +230,7 @@ class Updater extends Plugin {
CACHE_DIR,
CACHE_DIR . "/export",
CACHE_DIR . "/images",
+ CACHE_DIR . "/js",
CACHE_DIR . "/simplepie",
ICONS_DIR,
LOCK_DIRECTORY);