merge mozilla-inbound to mozilla-central a=merge

2017-08-08 13:18:14 +02:00
parent f68afeb668 84a1d0d32f
commit b83067d218
106 changed files with 1910 additions and 1638 deletions
--- a/browser/components/extensions/ext-menus.js
+++ b/browser/components/extensions/ext-menus.js
@@ -3,7 +3,7 @@
 "use strict";

 // The ext-* files are imported into the same scopes.
-/* import-globals-from ext-utils.js */
+/* import-globals-from ext-browser.js */

 Cu.import("resource://gre/modules/Services.jsm");