From 805fca678b70b209a1d0d11d27447f23237feab0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 1 Apr 2014 13:31:10 -0700 Subject: [PATCH] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fca93ff8ee10 Author: Miller Medeiros Desc: Merge pull request #17831 from millermedeiros/989785-backout-duplicated-dom Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/1d65adac71b0 Author: Miller Medeiros Desc: Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression ======== https://hg.mozilla.org/integration/gaia-central/rev/369a20a696bf Author: Miller Medeiros Desc: Revert "Bug 988079 - [Calendar] day view sometimes adds duplicated days to the DOM" This reverts commit 277ef605c8f8305fe91a65559bfe35ca3458852b. Conflicts: apps/calendar/test/marionette/day_view_test.js apps/calendar/test/unit/views/day_test.js --- 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 fbdd4bba25d..15d42544c33 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "cd17998374ac443c57e8637d52c5a5195e392dda", + "revision": "fca93ff8ee1066c75a23524029d265cb581e5a51", "repo_path": "/integration/gaia-central" }