| commit | 8e953046315ce5d7edcd8edae581407212b30af3 | |
| author | B2G Bumper Bot <release+b2gbumper@mozilla.com> | |
| Fri, 5 Dec 2014 16:56:46 +0000 (5 08:56 -0800) | ||
| committer | B2G Bumper Bot <release+b2gbumper@mozilla.com> | |
| Fri, 5 Dec 2014 16:56:46 +0000 (5 08:56 -0800) | ||
| tree | 18111cb7810cca5ccf6bebfb99d792aff656ac02 | treesnapshot (tar.gz zip) |
| parent | 4eeced5fd8b2aa8c74249d092c2fd4f8dc72b8f1 | commitdiff |
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========
https://hg.mozilla.org/integration/gaia-2_1/rev/02630a717542
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #26640 from nullaus/v2.1
Merge pull request #26598 from nullaus/bug1100714
========
https://hg.mozilla.org/integration/gaia-2_1/rev/7dae26187eeb
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #26598 from nullaus/bug1100714
Bug1100714
(cherry picked from commit 81580722b6f7e576a11e7973c0899cd55bd2f24c)
Conflicts:
apps/system/test/unit/app_chrome_test.js
========
https://hg.mozilla.org/integration/gaia-2_1/rev/02630a717542
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #26640 from nullaus/v2.1
Merge pull request #26598 from nullaus/bug1100714
========
https://hg.mozilla.org/integration/gaia-2_1/rev/7dae26187eeb
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #26598 from nullaus/bug1100714
Bug1100714
(cherry picked from commit 81580722b6f7e576a11e7973c0899cd55bd2f24c)
Conflicts:
apps/system/test/unit/app_chrome_test.js
| b2g/config/gaia.json | diffblobblamehistory |