resync patches

NanoAdblocker · May 24, 2019 · 5d41ef3 · 5d41ef3
1 parent e3566a4
commit 5d41ef3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/patches/20_0_configuration_tweaks.patch b/patches/20_0_configuration_tweaks.patch
@@ -1,5 +1,5 @@
 diff --git a/src/js/assets.js b/src/js/assets.js
-index ad343006..259a49f9 100644
+index 77f92304..528adf09 100644
 --- a/src/js/assets.js
 +++ b/src/js/assets.js
 @@ -351,7 +351,7 @@ const registerAssetSource = function(assetKey, dict) {
@@ -11,7 +11,7 @@ index ad343006..259a49f9 100644
      }
      if ( entry.submitter ) {
          entry.submitTime = Date.now(); // To detect stale entries
-@@ -918,7 +918,7 @@ api.rmrf = function() {
+@@ -922,7 +922,7 @@ api.rmrf = function() {
  // Asset updater area.
  var updaterStatus,
      updaterTimer,

diff --git a/patches/integration/10_2_extended_resources.patch b/patches/integration/10_2_extended_resources.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/assets.js b/src/js/assets.js
-index 286a4320..ad343006 100644
+index 90ce0aa7..77f92304 100644
 --- a/src/js/assets.js
 +++ b/src/js/assets.js
-@@ -970,6 +970,9 @@ var updateNext = function() {
+@@ -974,6 +974,9 @@ var updateNext = function() {
              if ( assetKey === 'ublock-resources' && noRemoteResources ) {
                  continue;
              }