Resync patches

NanoAdblocker · Feb 6, 2019 · 78f4a87 · 78f4a87
1 parent d9e9891
commit 78f4a87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/patches/20_0_configuration_tweaks.patch b/patches/20_0_configuration_tweaks.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/assets.js b/src/js/assets.js
-index 33f776a2..8c57ce57 100644
+index 333e2b31..bade272e 100644
 --- a/src/js/assets.js
 +++ b/src/js/assets.js
-@@ -313,7 +313,7 @@ const registerAssetSource = function(assetKey, dict) {
+@@ -331,7 +331,7 @@ const registerAssetSource = function(assetKey, dict) {
          entry.contentURL = [];
      }
      if ( typeof entry.updateAfter !== 'number' ) {
@@ -11,7 +11,7 @@ index 33f776a2..8c57ce57 100644
      }
      if ( entry.submitter ) {
          entry.submitTime = Date.now(); // To detect stale entries
-@@ -900,7 +900,7 @@ api.rmrf = function() {
+@@ -918,7 +918,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 c6f1410b..33f776a2 100644
+index a1a9e115..333e2b31 100644
 --- a/src/js/assets.js
 +++ b/src/js/assets.js
-@@ -952,6 +952,9 @@ var updateNext = function() {
+@@ -970,6 +970,9 @@ var updateNext = function() {
              if ( assetKey === 'ublock-resources' && noRemoteResources ) {
                  continue;
              }