Auto merge of #26202 - emilio:gecko-sync, r=emilio

style: Sync changes from mozilla-central.

See individual commits for details.

https://bugzilla.mozilla.org/show_bug.cgi?id=1630676
This commit is contained in:
bors-servo 2020-04-16 16:35:43 -04:00 committed by GitHub
commit 2829945963
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
118 changed files with 3141 additions and 3196 deletions

View file

@ -31,7 +31,7 @@ from mach.decorators import (
from mach.registrar import Registrar
# Note: mako cannot be imported at the top level because it breaks mach bootstrap
sys.path.append(path.join(path.dirname(__file__), "..", "..",
"components", "style", "properties", "Mako-0.9.1.zip"))
"components", "style", "properties", "Mako-1.1.2-py2.py3-none-any.whl"))
from servo.command_base import (
archive_deterministically,