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

@ -638,7 +638,7 @@
; All the pref files must be part of base to prevent migration bugs
@RESPATH@/browser/@PREF_DIR@/basilisk.js
@RESPATH@/browser/@PREF_DIR@/basilisk-branding.js
@RESPATH@/greprefs.js
@RESPATH@/goanna.js
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions