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

========

https://hg.mozilla.org/integration/gaia-central/rev/ac41749c5404
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20359 from EverythingMe/1023312-floor-dimension

Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]

========

https://hg.mozilla.org/integration/gaia-central/rev/fd7ed5cbcc61
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]

========

https://hg.mozilla.org/integration/gaia-central/rev/ab926c616615
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #20372 from 6a68/revert-bug-1004251

Revert "Bug 1004251 - Add resend verification email to firefox accounts....

========

https://hg.mozilla.org/integration/gaia-central/rev/0a757abe9870
Author: Jared Hirsch <ohai@6a68.net>
Desc: Revert "Bug 1004251 - Add resend verification email to firefox accounts. r=ferjm,arthurcc"

This reverts commit f8f70f699d50d3669b507c1bad245b1709c95a50.

Conflicts:
	apps/settings/js/firefox_accounts/panel.js
This commit is contained in:
B2G Bumper Bot 2014-06-11 11:01:29 -07:00
parent 63eff9d511
commit 7af6827d73

View File

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "d6cf58c5909ec588ac43c88358181201e5f581ad",
"revision": "ac41749c54044e376451c2a9e35a60c0f221d895",
"repo_path": "/integration/gaia-central"
}