From 95bad69206b868c9b2b48b402c249b096c8bd0cb Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 11 Dec 2013 21:10:23 -0800 Subject: [PATCH] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5bfef5faac50 Author: evelynhung Desc: Merge pull request #14368 from svic/rebase-df070d4e-NFC-Settings-permission Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created. r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/faaf2b447dad Author: Garner Lee Desc: Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created. This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL. Conflicts: apps/settings/manifest.webapp --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4efd71d18efe..073e1333333b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a91a7956eb49a8559ce3aec5595134f5e5e9ac5c", + "revision": "5bfef5faac50d14e055f642a44ed2df8483fb2fe", "repo_path": "/integration/gaia-central" }