Merge fx-team to inbound. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 20 Mar 2016 00:25:17 -0400
changeset 289525 f14898695ee0dd14615914f3e1401f17df57fdd7
parent 289524 de7baace275ad30bb1eae8e5fe85a9a8f5d1e779 (current diff)
parent 289520 e08d7dcc4a60cb080293723ecae491fddbd5c3ea (diff)
child 289526 28fd36d6608b38a60677bab399ec3d3ef7ead098
child 289536 1e26562f4f3673214e34c4733bcce3e342c81dbc
push id30104
push userryanvm@gmail.com
push dateSun, 20 Mar 2016 04:25:55 +0000
treeherdermozilla-central@f14898695ee0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone48.0a1
first release with
nightly linux32
f14898695ee0 / 48.0a1 / 20160320030409 / files
nightly linux64
f14898695ee0 / 48.0a1 / 20160320030409 / files
nightly mac
f14898695ee0 / 48.0a1 / 20160320030409 / files
nightly win32
f14898695ee0 / 48.0a1 / 20160320030409 / files
nightly win64
f14898695ee0 / 48.0a1 / 20160320030409 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge fx-team to inbound. a=merge
--- a/browser/app/permissions
+++ b/browser/app/permissions
@@ -5,16 +5,18 @@
 # * type is a string that identifies the type of permission (e.g. "cookie")
 # * permission is an integer between 1 and 15
 # See nsPermissionManager.cpp for more...
 
 # UITour
 origin	uitour	1	https://www.mozilla.org
 origin	uitour	1	https://self-repair.mozilla.org
 origin	uitour	1	https://support.mozilla.org
+origin	uitour	1	https://addons.mozilla.org
+origin	uitour	1	https://services.addons.mozilla.org
 origin	uitour	1	about:home
 
 # XPInstall
 origin	install	1	https://addons.mozilla.org
 
 # Remote troubleshooting
 origin	remote-troubleshooting	1	https://input.mozilla.org
 origin	remote-troubleshooting	1	https://support.mozilla.org