From 19a8c1ff52c8ef647f1da3e8469e857ea527ff19 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 26 Oct 2015 04:40:35 -0700 Subject: [PATCH] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c2fd9a328eeb Author: Martijn Desc: Merge pull request #32720 from mwargers/1218104 Bug 1218104 - Failure in test_marketplace_addon.py because of changing install button ======== https://hg.mozilla.org/integration/gaia-central/rev/772cf19c6276 Author: Martijn Wargers Desc: Bug 1218104 - Failure in test_marketplace_addon.py because of changing install button ======== https://hg.mozilla.org/integration/gaia-central/rev/ae0a0e8f60e7 Author: Julien Wajsberg Desc: Merge pull request #32696 from julienw/1217267-permission-websites Bug 1217267 - Remove "Remember my choice" for hosted content. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/944e819a44e9 Author: Julien Wajsberg Desc: Bug 1217267 - Remove "Remember my choice" for non-app content. r=timdream --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a396ed51413e..e1bddd1c3370 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "f847caf6826baca3d31543c9e2593abfff0d8b70", + "git_revision": "a04dc21b1d99c971e1e1e550afd0a3b45b489342", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "f19ed2b06d6e5614cfc2f4bef4038092a9de4afd", + "revision": "c2fd9a328eeb35a4f1b7137c12409cdf0a236d81", "repo_path": "integration/gaia-central" }