Skip to content

Commit

Permalink
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
Browse files Browse the repository at this point in the history
========

https://hg.mozilla.org/integration/gaia-central/rev/18a7681ac7c7
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1107139 - Show id-overlay when there's no screenshot. r=etienne" for conflicting with mozilla-inbound

This reverts commit b59f8b0.

========

https://hg.mozilla.org/integration/gaia-central/rev/56696c9032c1
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #28877 from yuwen41200/master

Bug 1141971 - [Privacy Controls] fix remaining words, r=marta

========

https://hg.mozilla.org/integration/gaia-central/rev/da19d6ef4a58
Author: yuwen41200 <yuwen41200@gmail.com>
Desc: Rename remaining 'privacy panel' to 'privacy controls'
  • Loading branch information
B2G Bumper Bot committed Mar 18, 2015
1 parent 74be22b commit 6ea2144
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions b2g/config/gaia.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"git": {
"git_revision": "1bd1a1bd950e1d5c2dea30a84d9ce42cfd50802b",
"git_revision": "b8051d370ddf4e5bd8e7d8a19fb9eeb5fd6ffb39",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
"revision": "7e3ce02dd9c52f773a7245bf9a11f86652ced64e",
"revision": "18a7681ac7c78cd21cc22de6ea1746fcab1c2f62",
"repo_path": "integration/gaia-central"
}

0 comments on commit 6ea2144

Please sign in to comment.