summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-13 05:41:07 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-13 05:41:07 -0400
commit8e5056ce2fa45726c5498c04808b7b4b9ee107e0 (patch)
tree63e5db7a4813a0e7d6cce566988eefa4e7709ed4 /application
parentdc4c5d4c79849f68063140f804de5567f0281d3f (diff)
parent7d1126fad325e889559b1f9113cbbb17d49842fa (diff)
downloadUXP-8e5056ce2fa45726c5498c04808b7b4b9ee107e0.tar
UXP-8e5056ce2fa45726c5498c04808b7b4b9ee107e0.tar.gz
UXP-8e5056ce2fa45726c5498c04808b7b4b9ee107e0.tar.lz
UXP-8e5056ce2fa45726c5498c04808b7b4b9ee107e0.tar.xz
UXP-8e5056ce2fa45726c5498c04808b7b4b9ee107e0.zip
Merge branch 'master' into Sync-weave
Diffstat (limited to 'application')
-rw-r--r--application/palemoon/app/blocklist.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/application/palemoon/app/blocklist.xml b/application/palemoon/app/blocklist.xml
index d55784169..fa594aabe 100644
--- a/application/palemoon/app/blocklist.xml
+++ b/application/palemoon/app/blocklist.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<blocklist lastupdate="1534840140000"
+<blocklist lastupdate="1554898538000"
xmlns="http://www.mozilla.org/2006/addons-blocklist">
<emItems>
<emItem blockID="i545" id="superlrcs@svenyor.net">
@@ -2524,6 +2524,11 @@ xmlns="http://www.mozilla.org/2006/addons-blocklist">
</versionRange>
<prefs></prefs>
</emItem>
+ <emItem blockID="pm114" id="jid1-KKzOGWgsW3Ao4Q@jetpack">
+ <versionRange minVersion="2.9.9" maxVersion="2.9.9" severity="3">
+ </versionRange>
+ <prefs></prefs>
+ </emItem>
</emItems>
<pluginItems>
<pluginItem blockID="p26">