| commit | b457be695a691ffe5f9983a2a604af3a867e7c8e | |
| author | B2G Bumper Bot <release+b2gbumper@mozilla.com> | |
| Fri, 3 Apr 2015 22:00:22 +0000 (3 15:00 -0700) | ||
| committer | B2G Bumper Bot <release+b2gbumper@mozilla.com> | |
| Fri, 3 Apr 2015 22:00:22 +0000 (3 15:00 -0700) | ||
| tree | 9f2a10e0d675fb37b4f813a13033afff7eb558e2 | treesnapshot (tar.gz zip) |
| parent | 2a422c559064a5ccf605145c3abc3ddf3d8ac0fd | commitdiff |
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========
https://hg.mozilla.org/integration/gaia-2_1/rev/7fe941496d6d
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #29320 from RudyLu/keyboard/Bug1132778-Fulah_dictionary_v2.1
Bug 1132778 - merge pull request #28588 from
========
https://hg.mozilla.org/integration/gaia-2_1/rev/02848261e4cd
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1132778 - merge pull request #28588 from RudyLu:keyboard/Bug1132778-Fulah_dictionary to mozilla-b2g:master
(cherry picked from commit bfe504b49533fb268c5ddda99c606aa66442b313)
Conflicts:
apps/keyboard/test/build/integration/resources/all-layout-make-layouts.json
apps/keyboard/test/build/integration/resources/no-preload-dict-required-make-layouts.json
========
https://hg.mozilla.org/integration/gaia-2_1/rev/7fe941496d6d
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #29320 from RudyLu/keyboard/Bug1132778-Fulah_dictionary_v2.1
Bug 1132778 - merge pull request #28588 from
========
https://hg.mozilla.org/integration/gaia-2_1/rev/02848261e4cd
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1132778 - merge pull request #28588 from RudyLu:keyboard/Bug1132778-Fulah_dictionary to mozilla-b2g:master
(cherry picked from commit bfe504b49533fb268c5ddda99c606aa66442b313)
Conflicts:
apps/keyboard/test/build/integration/resources/all-layout-make-layouts.json
apps/keyboard/test/build/integration/resources/no-preload-dict-required-make-layouts.json
| b2g/config/gaia.json | diffblobblamehistory |