Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-04-13 07:34:39 +08:00
commit 2b48a6c6ee
48 changed files with 1596 additions and 1006 deletions

View file

@ -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">