wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
191,311 Commits 1 Branch 166 Tags 1.2 GiB
cc5422cd68
Commit Graph

9814 Commits

Author SHA1 Message Date
B2G Bumper Bot
cc5422cd68 Bumping manifests a=b2g-bump 2014-07-01 01:06:12 -07:00
B2G Bumper Bot
f30cc8db36 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/68d44a2c064f
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21155 from yurenju/xpcshell

Bug 1032051 - Fix jshint error for build/xpcshell-commonjs.js r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/76cc26cf6297
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1032051 - Fix jshint error for build/xpcshell-commonjs.js
 2014-07-01 01:00:28 -07:00
B2G Bumper Bot
1962011456 Bumping manifests a=b2g-bump 2014-07-01 00:46:55 -07:00
B2G Bumper Bot
10481c9833 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/78785ff91c6d
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21152 from yurenju/add-build-jshint

Bug 1031992 - enable jshint for build direcotry r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/da939e8fa98b
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1031992 - enable jshint for build direcotry
 2014-07-01 00:45:30 -07:00
B2G Bumper Bot
bba0eacc93 Bumping manifests a=b2g-bump 2014-07-01 00:41:41 -07:00
B2G Bumper Bot
11f0e29cdd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/145448a42810
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21200 from KevinGrandon/bug_1032557_collections_synchronize

Bug 1032557 - Synchronize logic for collections

========

https://hg.mozilla.org/integration/gaia-central/rev/fa9dec8ac1f6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1032557 - Synchronize logic for collections r=crdlc
 2014-07-01 00:35:26 -07:00
B2G Bumper Bot
e18098af97 Bumping manifests a=b2g-bump 2014-07-01 00:11:12 -07:00
B2G Bumper Bot
c65f29e522 Bumping gaia.json for 12 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/c6be5ea9890e
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #21174 from timdream/keyboard-modify-layout2

Bug 1023730 - Move modifyLayout() to layout_manager.js, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/b6af0364b76a
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part IV) Set imEngine name on modified layouts

========

https://hg.mozilla.org/integration/gaia-central/rev/0c78c1a144ea
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part VIII) Correct property naming for render.js

========

https://hg.mozilla.org/integration/gaia-central/rev/6750d0c3bca4
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part VII) Remove keyboardName and currentLayout from global

========

https://hg.mozilla.org/integration/gaia-central/rev/e04d7d08fa26
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part VI) Remove currentInputType from global

========

https://hg.mozilla.org/integration/gaia-central/rev/989df65bffef
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part V) Remove currentInputMode from global

========

https://hg.mozilla.org/integration/gaia-central/rev/89a1cf60e95d
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part IV) Remove layoutPage from global

========

https://hg.mozilla.org/integration/gaia-central/rev/1b953bb0f52f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part III) Remove inputContext from global

========

https://hg.mozilla.org/integration/gaia-central/rev/74664131dec3
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part II) currentModifiedLayout in LayoutManager

========

https://hg.mozilla.org/integration/gaia-central/rev/520d71f85ce5
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1023730 - (Part I) Move LayoutLoader to another script

========

https://hg.mozilla.org/integration/gaia-central/rev/58f16dc22117
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #21193 from snowmantw/issue1027438

Bug 1027438 - [LockScreen][System] Change the old locking events with ne...

========

https://hg.mozilla.org/integration/gaia-central/rev/75c208b48bab
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1027438 - [LockScreen][System] Change the old locking events with new window events > remove something missed and fork the event
 2014-07-01 00:05:28 -07:00
B2G Bumper Bot
176bc3764a Bumping manifests a=b2g-bump 2014-06-30 23:26:39 -07:00
B2G Bumper Bot
8950497e59 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/ef20236bd60e
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #21097 from crdlc/bug-1027253

Bug 1027253 - [Rocketbar][Settings] Missing grey subheaders in the setti...

========

https://hg.mozilla.org/integration/gaia-central/rev/be3f91f67d02
Author: crdlc <crdlc@tid.es>
Desc: Bug 1027253 - [Rocketbar][Settings] Missing grey subheaders in the settings for homescreen

========

https://hg.mozilla.org/integration/gaia-central/rev/64b9a8807983
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #21096 from crdlc/bug-1025517

Bug 1025517 - [Homescreen] Search bar text box not centered vertically i...

========

https://hg.mozilla.org/integration/gaia-central/rev/0c18086f6a85
Author: crdlc <crdlc@tid.es>
Desc: Bug 1025517 - [Homescreen] Search bar text box not centered vertically in container

========

https://hg.mozilla.org/integration/gaia-central/rev/7328ad5e844a
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #20880 from chuck-lee/bug-1010252_reconnect_issue

Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+

========

https://hg.mozilla.org/integration/gaia-central/rev/6d29c0f4991d
Author: Chuck Lee <chulee@mozilla.com>
Desc: Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
 2014-06-30 23:20:26 -07:00
B2G Bumper Bot
36eb04959b Bumping manifests a=b2g-bump 2014-06-30 23:16:42 -07:00
B2G Bumper Bot
1bb909d9d8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/6fff664db309
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #21166 from crdlc/bug-1032106

Bug 1032106 - [Vertical Homescreen] Pressing the home button returns to ...

========

https://hg.mozilla.org/integration/gaia-central/rev/91d62f9c77b2
Author: crdlc <crdlc@tid.es>
Desc: Bug 1032106 - [Vertical Homescreen] Pressing the home button returns to top after showing context menu
 2014-06-30 23:05:23 -07:00
B2G Bumper Bot
bf49afeab3 Bumping manifests a=b2g-bump 2014-06-30 21:36:16 -07:00
B2G Bumper Bot
d7cad9938e Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/373b6bd197c6
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #21157 from alivedise/bugzilla/1024483/immediate-homescreen-transition-on-firstboot

Bug 1024483 - Use immediate transition for homescreen from lockscreen, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/b76c00250da3
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1024483 - Use immediate transition for homescreen from lockscreen

========

https://hg.mozilla.org/integration/gaia-central/rev/85ba44c525a7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1029542 - Work around bug 1029542 so we can see collection bg image as we scroll"
 2014-06-30 21:30:31 -07:00
B2G Bumper Bot
bbd5aa57d6 Bumping manifests a=b2g-bump 2014-06-30 21:26:44 -07:00
B2G Bumper Bot
478f6b33c7 Bumping manifests a=b2g-bump 2014-06-30 21:06:18 -07:00
B2G Bumper Bot
906ab8a6c2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/7ea6c58735e8
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #19598 from pivanov/bug-1008127

Bug 1008127 - [Messages][Refresh] Subject handling in the Composer. r=steveck-chung

========

https://hg.mozilla.org/integration/gaia-central/rev/899689cb2193
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1008127 - [Messages][Refresh] Subject handling in the Composer
 2014-06-30 21:00:27 -07:00
B2G Bumper Bot
f1037aaae5 Bumping manifests a=b2g-bump 2014-06-30 20:26:39 -07:00
B2G Bumper Bot
cac4009e02 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/ab8396fcb14d
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #21204 from 6a68/bug-1028943-fmd-erase-media

Bug 1028943 - Only factoryReset() after all calls to delete() finish. r=...

========

https://hg.mozilla.org/integration/gaia-central/rev/09a66510f69d
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1028943 - Only factoryReset() after all calls to delete() finish. r=dougt a=bailey
 2014-06-30 20:20:27 -07:00
B2G Bumper Bot
4e1220d790 Bumping manifests a=b2g-bump 2014-06-30 19:51:47 -07:00
B2G Bumper Bot
858ae33841 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/14df7e6d7b08
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #21149 from snowmantw/issue970824

Bug 970824 - [LockScreen][System] Stop directly use 'lockScreen.locked'

========

https://hg.mozilla.org/integration/gaia-central/rev/6306f549c66d
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 970824 - [LockScreen][System] Stop directly use 'lockScreen.locked'
 2014-06-30 19:50:27 -07:00
B2G Bumper Bot
c4f4cb52bb Bumping manifests a=b2g-bump 2014-06-30 16:51:14 -07:00
B2G Bumper Bot
501c19d805 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/107f69477946
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21197 from KevinGrandon/update_node_modules

Update package.json to match gaia-node-modules

========

https://hg.mozilla.org/integration/gaia-central/rev/deb057120d21
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Update package.json to match gaia-node-modules
 2014-06-30 16:45:30 -07:00
B2G Bumper Bot
0726f2e4b3 Bumping manifests a=b2g-bump 2014-06-30 16:26:39 -07:00
B2G Bumper Bot
841b673c7c Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/52844e6a91b3
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1029336 - Only disable contextmenu for certified apps. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/45326148f6a3
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #21017 from azasypkin/bug-1026575-message-preview

Bug 1026575 - [B2G][SMS] Message preview in Messages app thread view disappears after opening app. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/f2d3e6bc84e0
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1026575 - [B2G][SMS] Message preview in Messages app thread view disappears after opening app. r=schung
 2014-06-30 16:20:26 -07:00
B2G Bumper Bot
31cc113dc5 Bumping manifests a=b2g-bump 2014-06-30 14:11:46 -07:00
B2G Bumper Bot
f2c847e331 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/944559e6e60f
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 1029336 - Only disable contextmenu for certified apps. r=alive" for Gaia-unit failures on TBPL

This reverts commit 163f259fc7c8a01e3265c050094767e3ad523b80.
 2014-06-30 14:10:26 -07:00
B2G Bumper Bot
dd88c0bb9d Bumping manifests a=b2g-bump 2014-06-30 13:46:56 -07:00
B2G Bumper Bot
b23a6136a2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f5eb367288cd
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #18696 from mcav/alarm-refactor

Bug 1001568 - [Clock] Refactor AlarmsDB and Alarm. r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/9191a7d7f1f8
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1001568 - [Clock] Refactor AlarmsDB and Alarm. r=millermedeiros
 2014-06-30 13:45:31 -07:00
B2G Bumper Bot
c1aeb72ec5 Bumping manifests a=b2g-bump 2014-06-30 13:21:14 -07:00
B2G Bumper Bot
46602d5414 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a015b356e984
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21143 from KevinGrandon/bug_1028688_collection_pinned_push_to_unshift

Bug 1028688 - [Collection] Render icon after an add operation from homescreen

========

https://hg.mozilla.org/integration/gaia-central/rev/bb6f2e8c7113
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1028688 - [Collection] Render icon after an add operation from homescreen r=ranbena
 2014-06-30 13:15:30 -07:00
B2G Bumper Bot
b0a4434d55 Bumping manifests a=b2g-bump 2014-06-30 12:56:14 -07:00
B2G Bumper Bot
9be2ca1a5a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/25bd1b42ec80
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21170 from crdlc/bug-1032122

Bug 1032122 - [Vertical Homescreen] Statusbar not opaque when opening a dialog in verticalhome to remove apps/bookmarks/collections

========

https://hg.mozilla.org/integration/gaia-central/rev/623c02fd82e7
Author: crdlc <crdlc@tid.es>
Desc: Bug 1032122 - [Vertical Homescreen] Statusbar not opaque when opening a dialog in verticalhome to remove apps/bookmarks/collections
 2014-06-30 12:45:29 -07:00
B2G Bumper Bot
f1de352736 Bumping manifests a=b2g-bump 2014-06-30 12:21:48 -07:00
B2G Bumper Bot
efa1638f7f Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f537ef0ccb3d
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1029336 - Only disable contextmenu for certified apps. r=alive
 2014-06-30 12:20:27 -07:00
B2G Bumper Bot
bc457462d9 Bumping manifests a=b2g-bump 2014-06-30 11:11:46 -07:00
B2G Bumper Bot
64fe80f4cf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a25f5243e68c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21181 from EverythingMe/1030820-24-results

Bug 1030820 - [Collection app] Retrieve more web results [r=kgrandon]

========

https://hg.mozilla.org/integration/gaia-central/rev/cacc206d46e9
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 1030820 - [Collection app] Retrieve more web results [r=kgrandon]
 2014-06-30 11:10:25 -07:00
B2G Bumper Bot
2dedfbaaaf Bumping manifests a=b2g-bump 2014-06-30 10:01:39 -07:00
B2G Bumper Bot
468df64ef7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/2fff3999b2f7
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #20874 from dominickuo/bug-1026328

Bug 1026328 - [Settings] Also set the l10nId to the tone buttons, r=EragonJ

========

https://hg.mozilla.org/integration/gaia-central/rev/871c33749da5
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 1026328 - [Settings] Also set the l10nId to the tone buttons
 2014-06-30 09:55:26 -07:00
B2G Bumper Bot
8151c5a4d8 Bumping manifests a=b2g-bump 2014-06-30 09:51:13 -07:00
B2G Bumper Bot
2acd5184df Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/30014779028e
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1004985 - Close screenshot notification when user responds to it. r=timdream
 2014-06-30 09:45:30 -07:00
B2G Bumper Bot
af3e9c684a Bumping manifests a=b2g-bump 2014-06-30 08:46:57 -07:00
B2G Bumper Bot
e93c244862 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/5c259bd22f64
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #21169 from vingtetun/bug1021857

Bug 1021857 - [B2G][2.0][Everything.me ] User can get e.me to appear ove...

========

https://hg.mozilla.org/integration/gaia-central/rev/97e5906d1b5e
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1021857 - [B2G][2.0][Everything.me ] User can get e.me to appear over the dialer when on a call. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/a125157fc7ef
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #21187 from vingtetun/bug1032131

Bug 1032131 - [Homescreen] Statusbar is not opaque anymore when entering...

========

https://hg.mozilla.org/integration/gaia-central/rev/bf80ac3cec17
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1032131 - [Homescreen] Statusbar is not opaque anymore when entering edit mode. r=kgrandon
 2014-06-30 08:45:30 -07:00
B2G Bumper Bot
216f37a18a Bumping manifests a=b2g-bump 2014-06-30 08:41:44 -07:00
B2G Bumper Bot
69febb7f2d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/01829ae8ef73
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21144 from KevinGrandon/bug_1028690_collection_pin_unpin_icon_update

Bug 1028690 - [Collection app] Pinning/unpinning web results doesn't trigger icon update

========

https://hg.mozilla.org/integration/gaia-central/rev/3c075294096c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1028690 - [Collection app] Pinning/unpinning web results doesn't trigger icon update r=ranbena
 2014-06-30 08:35:26 -07:00
B2G Bumper Bot
4bc6fc6f71 Bumping manifests a=b2g-bump 2014-06-30 08:26:43 -07:00
B2G Bumper Bot
d12c5cc934 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/cd4593d3318c
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #21182 from viorelaioia/1028192

Bug 1028192 - Disable ActiveSync tests

========

https://hg.mozilla.org/integration/gaia-central/rev/7f9e7c9ccab8
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1028192 - Disable ActiveSync tests
 2014-06-30 08:20:26 -07:00
B2G Bumper Bot
3396138559 Bumping manifests a=b2g-bump 2014-06-30 06:31:09 -07:00
B2G Bumper Bot
218d8466ce Bumping gaia.json for 6 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/bb6d34a4d2e6
Author: AndreiH <andrei.hutusoru@softvision.ro>
Desc: Merge pull request #21109 from bebef1987/dissmiss

Bug 1023048 - [UITest] The condition of keyboard dismiss is not correct

========

https://hg.mozilla.org/integration/gaia-central/rev/fd7dc16f330d
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 1023048 - [UITest] The condition of keyboard dismiss is not correct

========

https://hg.mozilla.org/integration/gaia-central/rev/e056220e1371
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #21145 from DouglasSherk/1024460-conference-duplicates

 Bug 1024460 - [Dialer][Conference] Fix duplicate contact names and phone numbers in the conference participant list. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/219f3fe24e50
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1024460 - [Dialer][Conference] Fix duplicate contact names and phone numbers in the conference participant list. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/d6dc39e978a6
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #21141 from DouglasSherk/1031916-dialer-conference-broken

Bug 1031916 - [Dialer][Conference] Fix bad check for hasOwnProperty on telephony.conferenceGroup. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/71553abb86fb
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1031916 - [Dialer][Conference] Fix bad check for hasOwnProperty on telephony.conferenceGroup. r=etienne
 2014-06-30 06:25:27 -07:00
B2G Bumper Bot
9cbb1b5094 Bumping manifests a=b2g-bump 2014-06-30 05:56:46 -07:00