Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5bfef5faac50
Author: evelynhung <jj.evelyn@gmail.com>
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 <garner.lee@telekom.com>
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
This commit is contained in:
Gaia Pushbot 2013-12-11 21:10:23 -08:00
parent b7736a9ef3
commit 95bad69206

View File

@ -1,4 +1,4 @@
{ {
"revision": "a91a7956eb49a8559ce3aec5595134f5e5e9ac5c", "revision": "5bfef5faac50d14e055f642a44ed2df8483fb2fe",
"repo_path": "/integration/gaia-central" "repo_path": "/integration/gaia-central"
} }