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

This commit is contained in:
Roy Tam 2020-08-08 07:00:38 +08:00
commit e682016889
57 changed files with 869 additions and 582 deletions

View file

@ -2765,7 +2765,6 @@ MOZ_ARG_ENABLE_BOOL(mailnews,
MOZ_MAILNEWS=)
if test -n "$MOZ_MAILNEWS"; then
MOZ_MAILNEWS_OAUTH2=1
MOZ_MORK=1
MOZ_LDAP_XPCOM=1