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

This commit is contained in:
Roy Tam 2020-01-24 09:39:16 +08:00
commit 678ad26488
87 changed files with 492 additions and 1892 deletions

View file

@ -234,7 +234,7 @@
@RESPATH@/browser/defaults/permissions
@RESPATH@/browser/@PREF_DIR@/palemoon.js
@RESPATH@/browser/@PREF_DIR@/palemoon-branding.js
@RESPATH@/greprefs.js
@RESPATH@/goanna.js
@RESPATH@/defaults/autoconfig/prefcalls.js
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)