From d4c882ae4bd175d1979ef39a723162f9ebb93637 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 2 Apr 2018 09:46:33 -0400
Subject: [PATCH 1/3] new revision for dev build

---
 dist/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/version b/dist/version
index 0e67cb7779af9..568f8187553cd 100644
--- a/dist/version
+++ b/dist/version
@@ -1 +1 @@
-1.15.22
+1.15.23.0

From c70881e6a04f5d21a8d73f16797d18fe546cdbfb Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 2 Apr 2018 10:17:07 -0400
Subject: [PATCH 2/3] make Firefox dev build auto-update

---
 dist/firefox/updates.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/firefox/updates.json b/dist/firefox/updates.json
index 88a7e6c08bc67..8e98c2eecca4a 100644
--- a/dist/firefox/updates.json
+++ b/dist/firefox/updates.json
@@ -3,10 +3,10 @@
   "uBlock0@raymondhill.net": {
    "updates": [
     {
-     "version": "1.15.19rc6",
+     "version": "1.15.23b0",
      "applications": { "gecko": { "strict_min_version": "52" } },
-     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.15.19rc6",
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.15.19rc6/uBlock0.webext.signed.xpi"
+     "update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.15.23b0",
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.15.23b0/uBlock0.webext.signed.xpi"
     }
    ]
   }

From 98df44c3734fd1bbfba670ebfea8a748927ef76f Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 2 Apr 2018 11:03:12 -0400
Subject: [PATCH 3/3] invalidate resources selfie when new version is detected
 [Firefox]

---
 dist/version    |  2 +-
 src/js/start.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dist/version b/dist/version
index 568f8187553cd..d2d226120f41d 100644
--- a/dist/version
+++ b/dist/version
@@ -1 +1 @@
-1.15.23.0
+1.15.24
diff --git a/src/js/start.js b/src/js/start.js
index cda75e306821b..ebecd1573b8e9 100644
--- a/src/js/start.js
+++ b/src/js/start.js
@@ -105,6 +105,16 @@ var onPSLReady = function() {
 var onVersionReady = function(lastVersion) {
     if ( lastVersion === vAPI.app.version ) { return; }
 
+    // Since AMO does not allow updating resources.txt, force a reload when a
+    // new version is detected, as resources.txt may have changed since last
+    // release. This will be done only for release versions of Firefox.
+    if (
+        /^Mozilla-Firefox-/.test(vAPI.webextFlavor) &&
+        /(b|rc)\d+$/.test(vAPI.app.version) === false
+    ) {
+        µb.redirectEngine.invalidateResourcesSelfie();
+    }
+
     // From 1.15.19b9 and above, the `behind-the-scene` scope is no longer
     // whitelisted by default, and network requests from that scope will be
     // subject to filtering by default.