Merge in comm-release default (RELEASE_38_END) SEAMONKEY_2_35_RELEASE_BRANCH
authorJustin Wood <Callek@gmail.com>
Thu, 20 Aug 2015 20:56:07 -0400
branchSEAMONKEY_2_35_RELEASE_BRANCH
changeset 31199 232d361e03bfbaa161ec3681be5a01f7c1257f6c
parent 31193 77a191044190de8122c1f2d01018b5ab7b186dcc (current diff)
parent 31151 dca7454ed8b434782d526d5194ecbe5f038787e3 (diff)
child 31200 e6dcddf50595792e6de3dbe6d410d32482c8942c
push id1
push userclokep@gmail.com
push dateMon, 07 May 2018 22:45:56 +0000
treeherdercomm-esr60@57eacde5ef40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Merge in comm-release default (RELEASE_38_END)
client.py
old mode 100755
new mode 100644
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -32,15 +32,15 @@ THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 MOZ_UA_BUILDID=20100101
 
 MOZ_BRANDING_DIRECTORY=mail/branding/aurora
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-beta,thunderbird-comm-release
+ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-beta
+MAR_CHANNEL_ID=thunderbird-comm-release
 # Enable generational GC on desktop.
 JSGC_GENERATIONAL=1
 MOZ_PROFILE_MIGRATOR=1
 MOZ_JSDOWNLOADS=1