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
152,218 Commits 1 Branch 165 Tags 1.2 GiB
8c0916e23c
Commit Graph

152218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vicamo Yang
8c0916e23c Bug 920551 - 2.d/2: fix ICC. r=hsinyi,khuey 2013-10-29 16:12:40 +08:00
Vicamo Yang
57799aafc6 Bug 920551 - 2.c/2: fix CellBroadcast. r=hsinyi 2013-10-29 16:12:39 +08:00
Vicamo Yang
c13036d07b Bug 920551 - 2.b/2: fix Telephony. r=hsinyi,khuey 2013-10-29 16:12:38 +08:00
Vicamo Yang
638a2abf68 Bug 920551 - 2.a/2: fix MobileMessage. r=gene,khuey 2013-10-29 16:12:37 +08:00
Vicamo Yang
28b234c1de Bug 920551 - 1/2: Allow building b2g without MOZ_B2G_RIL. r=khuey 2013-10-29 16:12:36 +08:00
Gaia Pushbot
0d54941ef1 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/1010c4c9abb5
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #13119 from EverythingMe/912361-eme-banner

Bug 912361 - [e.me] Re-use Homescreen Status Banner [r=crdlc, ranbena]

========

https://hg.mozilla.org/integration/gaia-central/rev/07bf317dadbb
Author: Amir Nissim <amirn@everything.me>
Desc: Bug 912361 - [e.me] Re-use Homescreen Status Banner [r=crdlc, ranbena]
 2013-10-29 01:10:23 -07:00
Gaia Pushbot
ead12fbae9 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/2fa2d77525c0
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #13110 from RudyLu/keyboard/Bug925003_greekSMS_master_v1.2

Bug 925003 - Add a new keyboard layout, "Greek SMS" to allow sending mes...
r=djf, julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/7413aadf84d5
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 925003 - Add a new keyboard layout, "Greek SMS" to allow sending messages with GSM 7-bit encoding.
 - Disable auto crrection for Greek SMS keyboard layout.
 2013-10-29 01:00:24 -07:00
Gaia Pushbot
7edea409cc Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d2dbad943faf
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #12736 from EragonJ/bug-901852

Bug 901852 - [sms][mms] don't run the time header scheduler if the page ...

========

https://hg.mozilla.org/integration/gaia-central/rev/b9681771cba1
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 901852 - [sms][mms] don't run the time header scheduler if the page is hidden

- call TimeHeaderScheduler at right time
- add related tests
 2013-10-28 22:36:24 -07:00
na-kobayashi
535ffea4e2 Bug 910091: add cdmaServiceCategory to CellBroadcastMessage. r=vicamo 2013-10-28 15:06:48 +09:00
Gaia Pushbot
c8c1779a19 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/61d669984f76
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #12874 from rexboy7/fix-bug894270

bug 894270 - [Dialer] Display calls following v1.2 spec; switch photo when switching calls. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/577003db74e6
Author: Rex Lee <rexboy@mozilla.com>
Desc: bug 894270 - [Dialer] switch photos correctly when switching calls.
              Show detail info of participants correctly on multi-calls.
 2013-10-28 21:05:23 -07:00
Jan Jongboom
66d37389ce Bug 924893 - Add info for the value_selector to contextchange chrome event. r=yxl 2013-10-17 11:08:55 -04:00
Gaia Pushbot
87a02f6f1e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/6469f3bd4b70
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #12846 from rexboy7/fix-bug917344

Bug 917344 - [Dialer] Turn off speaker if bluetooth headphone is connect...

========

https://hg.mozilla.org/integration/gaia-central/rev/ca5994516df0
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 917344 - [Dialer] Turn off speaker if bluetooth headphone is connected during a call
 2013-10-28 19:55:24 -07:00
Gaia Pushbot
49f1874057 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/eb6f5e284eca
Author: Mihai Cîrlănaru <mihai@cirlanaru.com>
Desc: Merge pull request #11358 from mcirlanaru/bug_896205

Bug 896205 - [Contacts] Keep aspect ratio for image thumbnails. r=@arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/deb2c1ba8a9d
Author: Mihai Cirlanaru <mihai@cirlanaru.com>
Desc: Bug 896205 - [Contacts] Keep aspect ratio for image thumbnails. r=arcturus
 2013-10-28 18:30:25 -07:00
Gaia Pushbot
fd9ab5a070 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/409457dfbe54
Author: Evelyn Eastmond <evhan55@gmail.com>
Desc: Bug 910854 - [Clock] Reduce analog face resizing from 4 sizes to 3 sizes

r=jugglinmike
 2013-10-28 17:55:27 -07:00
Blake Kaplan
18adbbf72a Bug 924702 - Fix an XPCOM violation, compartment mismatch and rooting error. r=fabrice 2013-10-28 17:25:44 -07:00
Fabrice Desré
191e4bc75c Bug 924702 - Rewrite the app:// protocol handler in c++ r=jduell,mrbkap 2013-10-23 11:56:20 -07:00
Fabrice Desré
3d40fbc33b Backout bug 924893 for smoketest bustage 2013-10-28 13:55:36 -07:00
Gaia Pushbot
22861b5780 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/fe9fdd5d8bb5
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #12892 from comoyo/value_selector_inputcontext"

This reverts commit 4fb5a545dc2dc6d89e6f912f787e019a770d907c, reversing
changes made to fa366f051e657d49406dfebc433ccd69ea62353d.
 2013-10-28 13:11:14 -07:00
Gaia Pushbot
a6ccb0a7f0 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f938b8542d09
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #13088 from lissyx/bug923577

Bug 923577 - Ensure that we remove icons of hidden roles r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/778c88285c4a
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 923577 - Ensure that we remove icons of hidden roles r=crdlc

When installing an application that is hidden, we have to make sure,
when updating the icon, that we remove it. This case happens especially
with packaged role system app, like, in this bug, a ringtones app. We
end up creating a temp icon (because we only have a updateManifest at
that time and cannot decide the role of the app) while downloading,
which is not removed once the app is finally installed.
 2013-10-28 13:10:50 -07:00
Gaia Pushbot
b23db493f6 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/5396f45ccf7a
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #13150 from lightsofapollo/xfail-eme-app-launch

disable test_everythingme_launch_packaged_app.py a=test-only r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/dc8fe4bc7a49
Author: James Lal <james@lightsofapollo.com>
Desc: disable test_everythingme_launch_packaged_app.py a=test-only r=me
 2013-10-28 13:10:25 -07:00
Alexandre Lissy
2d5e3a420e Bug 921928 - Make <iframe mozbrower remote> a preferred target when fluffing r=roc 
In bug 921928, the user places a call and then tries to do other actions
(calls, SMS, contacts, ...) with actions very close to the attention
screen. When trying to do those other actions, event fluffing is
prioritizing the attention screen rather than user apps.
---
 layout/base/PositionedEventTargeting.cpp           |  10 ++
 layout/base/tests/Makefile.in                      |   2 +
 .../bug921928_event_target_iframe_apps_oop.html    |   8 +
 .../base/tests/test_event_target_iframe_oop.html   | 178 +++++++++++++++++++++
 4 files changed, 198 insertions(+)
 create mode 100644 layout/base/tests/bug921928_event_target_iframe_apps_oop.html
 create mode 100644 layout/base/tests/test_event_target_iframe_oop.html
 2013-10-28 11:38:03 -07:00
Gaia Pushbot
66e6c5c498 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/218c8b6ad922
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #12986 from brendandahl/pdfjs-0.8.629

Bug 929059 - Update pdf.js to version 0.8.629.

========

https://hg.mozilla.org/integration/gaia-central/rev/db54b13503ad
Author: Brendan Dahl <brendan.dahl@gmail.com>
Desc: Bug 929059 - Update pdf.js to version 0.8.629.
 2013-10-28 09:55:26 -07:00
Gaia Pushbot
9810b575a6 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/5ae393686108
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #13091 from fcampo/wifi-timeout-889623

Bug 889623 - [FTE] need to be able to cancel Wifi Scanning. (r=julienw)

========

https://hg.mozilla.org/integration/gaia-central/rev/47f7deea207e
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 889623 - [FTE] need to be able to cancel Wifi Scanning. Adding timeout
 2013-10-28 09:20:26 -07:00
Gaia Pushbot
627748b261 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d57a6f654752
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13141 from zacc/bug_931793

Bug 931793 - fix incorrect is_displayed() usage

========

https://hg.mozilla.org/integration/gaia-central/rev/4a83b4c6c186
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 931793 - fix incorrect is_displayed() usage
 2013-10-28 08:35:28 -07:00
Gaia Pushbot
9c106ddbc8 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f70bacc2777c
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #12504 from comoyo/keyboard_pop_down

Bug 912033 - Pop down animation keyboard. r=GaryChen

========

https://hg.mozilla.org/integration/gaia-central/rev/3875247397c1
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 912033 - Pop down animation keyboard
 2013-10-28 08:10:25 -07:00
Gaia Pushbot
374d02ea2b Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a1f4dbe091d7
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #12971 from ian-liu/bluetooth/Bug915584_revise_flow_for_receiving_file_without_SDCard

Bug 915584 - [Bluetooth][Contacts] Receiving a contact via bluetooth when the device does not have SD Card flow differs from the expected, r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/170ec7f9d9a9
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 915584 - [Bluetooth][Contacts] Receiving a contact via bluetooth when the device does not have SD Card flow differs from the expected

========

https://hg.mozilla.org/integration/gaia-central/rev/d3308d368858
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Merge pull request #12802 from caiolima/bug-815093"

This reverts commit 47b3bdf7a6e9396db6e09ac0453f782953ceda7a, reversing
changes made to 1d832634550de25526eaf93137940f9fd73a4c7f.
 2013-10-28 07:25:25 -07:00
Jessica Jong
1e5820615d Bug 929864 - B2G DSDS: correctly update RILNetworkInterface when wifi connection changes. f=edgar r=hsinyi 2013-10-24 02:01:00 +01:00
Gaia Pushbot
d68b43352d Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/f5dc746df1ae
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Bug 920546 - [Messages] Short-term fixes for the recipient panel r=julienw"

This reverts commit 7c5b6e746b800b3747c3be6eae67ad3948891497.
 2013-10-28 06:15:30 -07:00
Carsten "Tomcat" Book
5c5ba13e67 Merge mozilla-central to b2g-inbound 2013-10-28 13:10:47 +01:00
Alfred Kayser
c0e3b1f2fd Bug 926605 - followup to fix icon on Windows, r=gijs 2013-10-28 12:38:07 +01:00
Gaia Pushbot
a9dee8c901 Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/7864248beea9
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #13129 from MBRSL/persona-fix

Bug 913385 - Hardware testing app, r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/fa740ee56c00
Author: Tom Jao <tjao@mozilla.com>
Desc: Bug 913385 - Hardware testing app

Fix persona testing

========

https://hg.mozilla.org/integration/gaia-central/rev/cfa8930a9f9f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Revert "Merge pull request #13115 from RudyLu/keyboard/Bug928281-keyboard_OOP""

This reverts commit 90fbd75eccd3408ca04907fd80b72275771b3b30.
 2013-10-28 04:00:25 -07:00
Gaia Pushbot
d7c585c019 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/166023c341cc
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #13125 from askeing/bug_912010

Bug 912010 - [Gaia-UI-Test] Wait for keyboard key element before finding the element, r=wachen

========

https://hg.mozilla.org/integration/gaia-central/rev/dd2d0af273d5
Author: askeing <askeing@gmail.com>
Desc: Bug 912010 - [Keyboard][V1.2] Default Keyboard when all keyboards are de-selected
 2013-10-28 03:50:23 -07:00
Carsten "Tomcat" Book
88d4d669b7 Merge B2g-inbound to Mozilla-Central 2013-10-28 11:34:11 +01:00
Gaia Pushbot
0dc353d705 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

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

Bug 929943 - [Settings] Remove input type=range polyfill r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/67e8e53fa765
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 929943 - [Settings] Remove input type=range polyfill
 2013-10-28 03:25:24 -07:00
Gaia Pushbot
7f958b636e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/9c39fc940d76
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #13131 from snowmantw/issue930362

Bug 930362 - [LockScreen] The icons background would light up when touch on them

========

https://hg.mozilla.org/integration/gaia-central/rev/29cde2ae7c91
Author: Greg Weng (snowmantw) <gweng@mozilla.com>
Desc: Bug 930362 - [LockScreen] The icons background would light up when touch on them
 2013-10-28 03:05:26 -07:00
Gaia Pushbot
e23e68988f Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/522d17d2b730
Author: Joan Leon <joan@nucliweb.net>
Desc: Merge pull request #13128 from nucliweb/929565_Show_Password

Bug 929565 - [B2G][Settings][Wi-Fi] "Show Password" checkbox overlaps text

========

https://hg.mozilla.org/integration/gaia-central/rev/16797a81b47a
Author: nucliweb <joan@nucliweb.net>
Desc: Bug 929565 - [B2G][Settings][Wi-Fi] "Show Password" checkbox overlaps text
 2013-10-28 02:50:25 -07:00
Szu-Yu Chen [:aknow]
8fbb52afd5 Bug 919414 - Part 2: Modify tests. r=hsinyi 2013-10-28 17:22:44 +08:00
Szu-Yu Chen [:aknow]
357123858c Bug 919414 - Part 1: Clear existing calls in test setup. r=hsinyi 2013-10-28 17:21:16 +08:00
Gaia Pushbot
72076eb5b9 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/6eebea42f3f6
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #13123 from pivanov/bug-931555

Bug 931555 - [Bluetooth] - wrong button style on file transfer failed screen

========

https://hg.mozilla.org/integration/gaia-central/rev/55ca2e71c1af
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 931555 - [Bluetooth] - wrong button style on file transfer failed screen
 2013-10-28 02:15:24 -07:00
Carsten "Tomcat" Book
9aae614d69 Merge Fx-team to Mozilla-Central 2013-10-28 10:04:41 +01:00
Carsten "Tomcat" Book
76bb1abba4 Merge Mozilla-Inbound to Mozilla-Central 2013-10-28 10:03:25 +01:00
Gaia Pushbot
414e0a3845 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/31c586470ff2
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #12779 from bmac/924846

Bug 924846 - [Keyboard][V1.2] Selected keyboard cannot be displayed whil...
r=gchen

========

https://hg.mozilla.org/integration/gaia-central/rev/0603b7b9c2ba
Author: bmac <bmac325@GMail.com>
Desc: Bug 924846 - [Keyboard][V1.2] Selected keyboard cannot be displayed while switching the keyboard between built-in keyboard and third party keyboard
 2013-10-28 01:30:23 -07:00
Gene Lian
19bc17bea1 Bug 915071 - Panel screen is still off while 2nd incoming call in dialling. r=hsinyi a=koi+ 2013-10-28 14:07:28 +08:00
Gaia Pushbot
08066fa2ea Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d2632e2be46d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 909689 - Set data connection text based on the network mode and the existence of calls r=alive
 2013-10-27 21:45:24 -07:00
Phil Ringnalda
613ed5ff4e Merge f-t to m-c 2013-10-27 21:44:49 -07:00
Phil Ringnalda
2cc7401332 Merge m-i to m-c 2013-10-27 21:44:08 -07:00
Boris Zbarsky
77ea872b8d Bug 929512. Fix null default values for non-nullable unions containing a nullable type. r=dzbarsky, r=smaug pending 2013-10-28 00:33:15 -04:00
Gaia Pushbot
a71929cae5 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/33b06ed662ee
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Bug 909689 - Set data connection text based on the network mode and the existence of calls"

This reverts commit d505b37f2e856d0cf7c7cd5b37c02eec44f06b7d.
 2013-10-27 21:25:25 -07:00
Gaia Pushbot
407306abff Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/8e5ab4582834
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #13024 from MBRSL/eng-mode

Bug 913385 - Add Hardware tests mode r=evelyn,zac

========

https://hg.mozilla.org/integration/gaia-central/rev/7c55c55ae7f6
Author: Tom Jao <tjao@mozilla.com>
Desc: Bug 913385 - Add Hardware tests mode r=evelyn

    This patch organize old tests into API and UI parts, and add new Hardware tests.
    Also, there are some minor fixes on existing tests.
    HW tests mode provide the following tests:

    Audio loop
    Battery
    Bluetooth
    Camera
    Headphone
    LCD
    Physical keys
    Ringer
    SDCard
    Sensors
    Touch screen
    Vibrator
 2013-10-27 21:15:25 -07:00
Gaia Pushbot
d14ba1ed82 Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/b722b062fc40
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #12924 from steveck-chung/incoming-call-refinement

Bug 924736 - [Dialer] Incoming call lock screen icons css/animation fine -tune. r=etiennesegonzac, a=timdream.

========

https://hg.mozilla.org/integration/gaia-central/rev/6d7b8275b447
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 924736 - [Dialer] Incoming call lock screen icons css/animation fine-tune

========

https://hg.mozilla.org/integration/gaia-central/rev/6527c99890cc
Author: Rudy Lu <left.lu@gmail.com>
Desc: Revert "Merge pull request #13115 from RudyLu/keyboard/Bug928281-keyboard_OOP"

  This reverts commit 9c6586d85d4340600ace0aa69f5741c5f3f67970, reversing
  changes made to 0c52c04fa2e07c119f4777f1dddc1081734de4ab.

Revert "Bug 912010 - [Keyboard][V1.2] Default Keyboard when all keyboards are de-selected - r=rlu r=garychen r=arthurcc"

  This reverts commit ad0bf992cd379a32de18b9a4bb765757db8af986.

  Conflicts:
	apps/settings/index.html
 2013-10-27 21:14:32 -07:00