mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
561 925 коммитов 613 Ветки 98 Теги 5,8 GiB
Граф коммитов

24695 Коммитов

Автор SHA1 Сообщение Дата
Michael Comella 32f449da79 Bug 1405513: Add debug info to 'Requested position DNE' crash. r=sebastian 
MozReview-Commit-ID: 9ZLj7i74AgR

--HG--
extra : rebase_source : b6985c9cccace700e17dc851c8d879a5d2b984d2
 2017-10-03 16:45:04 -07:00
Wes Kocher 9e15b5649f Merge m-c to autoland, a=merge 
MozReview-Commit-ID: 43R3aNMoMyN
 2017-10-03 14:58:01 -07:00
Wes Kocher 7b3327cb2e Merge autoland to central, a=merge 
MozReview-Commit-ID: 4jAMhgCDoPO
 2017-10-03 13:25:44 -07:00
L10n Bumper Bot f019c7629d no bug - Bumping Fennec l10n changesets r=release a=l10n-bump 
an -> ['android', 'android-api-16', 'android-multilocale']
ar -> ['android', 'android-api-16', 'android-multilocale']
as -> ['android', 'android-api-16', 'android-multilocale']
ast -> ['android', 'android-api-16', 'android-multilocale']
az -> ['android', 'android-api-16', 'android-multilocale']
be -> ['android', 'android-api-16', 'android-multilocale']
bg -> ['android', 'android-api-16', 'android-multilocale']
bn-BD -> ['android', 'android-api-16']
bn-IN -> ['android', 'android-api-16', 'android-multilocale']
br -> ['android', 'android-api-16', 'android-multilocale']
ca -> ['android', 'android-api-16', 'android-multilocale']
cak -> ['android', 'android-api-16', 'android-multilocale']
cs -> ['android', 'android-api-16', 'android-multilocale']
cy -> ['android', 'android-api-16', 'android-multilocale']
da -> ['android', 'android-api-16', 'android-multilocale']
de -> ['android', 'android-api-16', 'android-multilocale']
dsb -> ['android', 'android-api-16', 'android-multilocale']
el -> ['android', 'android-api-16', 'android-multilocale']
en-GB -> ['android', 'android-api-16', 'android-multilocale']
en-ZA -> ['android', 'android-api-16', 'android-multilocale']
eo -> ['android', 'android-api-16', 'android-multilocale']
es-AR -> ['android', 'android-api-16', 'android-multilocale']
es-CL -> ['android', 'android-api-16', 'android-multilocale']
es-ES -> ['android', 'android-api-16', 'android-multilocale']
es-MX -> ['android', 'android-api-16', 'android-multilocale']
et -> ['android', 'android-api-16', 'android-multilocale']
eu -> ['android', 'android-api-16', 'android-multilocale']
fa -> ['android', 'android-api-16', 'android-multilocale']
ff -> ['android', 'android-api-16', 'android-multilocale']
fi -> ['android', 'android-api-16', 'android-multilocale']
fr -> ['android', 'android-api-16', 'android-multilocale']
fy-NL -> ['android', 'android-api-16', 'android-multilocale']
ga-IE -> ['android', 'android-api-16', 'android-multilocale']
gd -> ['android', 'android-api-16', 'android-multilocale']
gl -> ['android', 'android-api-16', 'android-multilocale']
gn -> ['android', 'android-api-16', 'android-multilocale']
gu-IN -> ['android', 'android-api-16', 'android-multilocale']
he -> ['android', 'android-api-16', 'android-multilocale']
hi-IN -> ['android', 'android-api-16', 'android-multilocale']
hr -> ['android', 'android-api-16', 'android-multilocale']
hsb -> ['android', 'android-api-16', 'android-multilocale']
hu -> ['android', 'android-api-16', 'android-multilocale']
hy-AM -> ['android', 'android-api-16', 'android-multilocale']
id -> ['android', 'android-api-16', 'android-multilocale']
is -> ['android', 'android-api-16', 'android-multilocale']
it -> ['android', 'android-api-16', 'android-multilocale']
ja -> ['android', 'android-api-16', 'android-multilocale']
ka -> ['android', 'android-api-16', 'android-multilocale']
kab -> ['android', 'android-api-16', 'android-multilocale']
kk -> ['android', 'android-api-16', 'android-multilocale']
kn -> ['android', 'android-api-16', 'android-multilocale']
ko -> ['android', 'android-api-16', 'android-multilocale']
lo -> ['android', 'android-api-16', 'android-multilocale']
lt -> ['android', 'android-api-16', 'android-multilocale']
lv -> ['android', 'android-api-16', 'android-multilocale']
mai -> ['android', 'android-api-16', 'android-multilocale']
ml -> ['android', 'android-api-16', 'android-multilocale']
mr -> ['android', 'android-api-16', 'android-multilocale']
ms -> ['android', 'android-api-16', 'android-multilocale']
my -> ['android', 'android-api-16', 'android-multilocale']
nb-NO -> ['android', 'android-api-16', 'android-multilocale']
ne-NP -> ['android', 'android-api-16']
nl -> ['android', 'android-api-16', 'android-multilocale']
nn-NO -> ['android', 'android-api-16', 'android-multilocale']
or -> ['android', 'android-api-16', 'android-multilocale']
pa-IN -> ['android', 'android-api-16', 'android-multilocale']
pl -> ['android', 'android-api-16', 'android-multilocale']
pt-BR -> ['android', 'android-api-16', 'android-multilocale']
pt-PT -> ['android', 'android-api-16', 'android-multilocale']
rm -> ['android', 'android-api-16', 'android-multilocale']
ro -> ['android', 'android-api-16', 'android-multilocale']
ru -> ['android', 'android-api-16', 'android-multilocale']
sk -> ['android', 'android-api-16', 'android-multilocale']
sl -> ['android', 'android-api-16', 'android-multilocale']
son -> ['android', 'android-api-16', 'android-multilocale']
sq -> ['android', 'android-api-16', 'android-multilocale']
sr -> ['android', 'android-api-16', 'android-multilocale']
sv-SE -> ['android', 'android-api-16', 'android-multilocale']
ta -> ['android', 'android-api-16', 'android-multilocale']
te -> ['android', 'android-api-16', 'android-multilocale']
th -> ['android', 'android-api-16', 'android-multilocale']
tr -> ['android', 'android-api-16', 'android-multilocale']
trs -> ['android', 'android-api-16']
uk -> ['android', 'android-api-16', 'android-multilocale']
ur -> ['android', 'android-api-16', 'android-multilocale']
uz -> ['android', 'android-api-16', 'android-multilocale']
vi -> ['android', 'android-api-16']
wo -> ['android', 'android-api-16', 'android-multilocale']
xh -> ['android', 'android-api-16', 'android-multilocale']
zam -> ['android', 'android-api-16', 'android-multilocale']
zh-CN -> ['android', 'android-api-16', 'android-multilocale']
zh-TW -> ['android', 'android-api-16', 'android-multilocale']
 2017-10-03 10:41:08 -07:00
Michael Comella b85cdd45bb Bug 1404460: Add test for pocket locale enabling. r=liuche 
MozReview-Commit-ID: LHdQuICvVjE

--HG--
extra : rebase_source : 101ce5408e6f329bf04b5e889e942d6f42953500
 2017-10-02 18:36:41 -07:00
Michael Comella 0b27441da0 Bug 1404460: Hide Pocket preference if Pocket not available in locale. r=liuche 
When changing locales, an open dialog will not refresh but clicking on the
"Top sites" preference again (to display the dialog) will show the correct
dialog for the current locale.

MozReview-Commit-ID: 6UJvDIJZJtc

--HG--
extra : rebase_source : 777d0f4bc34829c8aacdeaac42fc0e27c3e7afd6
 2017-10-02 17:35:03 -07:00
Michael Comella 3e9f59b825 Bug 1404460: Add POCKET_ENABLED_TO_LOCALE to asUserPrefs telemetry. r=liuche 
After speaking with liuche, we decided it'd be better to add a bit to determine
this rather than combining it with the isPocketEnabled field (which would be
loss of data) or cross-referencing the locale of the submitted event when
checking the Pocket value during telemetry analysis (which is hard to get right
and likely to get out of date).

MozReview-Commit-ID: JKFrdEsEbyp

--HG--
extra : rebase_source : bc20193ca29238cbde5361a840cbd367b492a346
 2017-10-02 17:01:10 -07:00
Michael Comella 8d7c0b37f0 Bug 1404460: Only show Pocket stories in specified locales. r=liuche 
Ideally, we'd centralize all queries as to which options are user specified.
However, I wanted to do the smallest change so we can uplift so I filed
bug 1405161 for this centralization.

I opted not to include the "de" locale that is included on desktop because it
does not appear we ever get the "de" locale on Firefox for Android [1].

I tested this patch by changing the system locale between locales with Pocket
on my device (en-US, en-GB, de-DE) and locales without Pocket (ko-KR). The
locale switching system makes this refresh automatically without extra code.

I also intend to test via the in-app locale switcher but that will take time
because I can't do artifact builds with multi-locale so I'm pushing this for
review before I'm finished.

Follow-up changes:
- Add to telemetry
- Hiding the preference in the undesired locales.
- A test for isPocketEnabledByLocaleInner (useful to document how this is
intended to work for locales with variants, different scripts, etc.)

[1]: https://sql.telemetry.mozilla.org/queries/4613#table

MozReview-Commit-ID: 7AVQ8fWub8I

--HG--
extra : rebase_source : 948f1a4ea6c6bbc51c8ae945b940d8ab4770e34e
 2017-10-02 15:59:42 -07:00
Michael Comella 8caed77b97 Bug 1403755: Rm code to insert blanks into top sites. r=liuche 
This code was being mistakenly activated when getting top sites for Activity
Stream.

This is the first removal of old top sites code and will mean we can't go back
to old top sites by flipping the `ActivityStream.isEnabled` flag. Since we're
planning to ship AS, this shouldn't matter.


MozReview-Commit-ID: 9VB0RqNHmE0

--HG--
extra : rebase_source : 0c40456d12de5d7f2f2e4a0fda58b7c090754530
 2017-09-28 14:09:48 -07:00
James Willcox a4eed17d59 Bug 1405021 - Use web app origin as default scope r=droeh 
MozReview-Commit-ID: EwxR6mQITmy

--HG--
extra : rebase_source : 2b2caec9e7fa8d4dc35976c7cd13a3e3ce0c796b
 2017-10-02 13:34:54 -05:00
James Willcox 5c9f9341f7 Bug 1400334 - Guard against no theme color in standalone webapp r=nechen 
MozReview-Commit-ID: C9LfdSvujS9

--HG--
extra : rebase_source : 55c2ae6c93a8df713c947b79250472a5468ca0d0
 2017-10-02 13:24:45 -05:00
Grigory Kruglov f4c2b679dc Bug 1405430 - Use a brand name instead of hard-coded 'Firefox' r=flod 
MozReview-Commit-ID: KfkPdGlw5hV

--HG--
extra : rebase_source : 865d7b8375e3b800845f06dd4c5db7a669f05eed
 2017-10-03 14:31:19 -04:00
Michael Comella f1209017b7 Bug 1405404: Add 'de' to list of pocket whitelisted locales. r=liuche 
This is used in multi-locale builds, e.g. [1] where all German is "de" but in
[2], we have a separate l10n repo for en-GB.

[1]: https://hg.mozilla.org/releases/l10n/mozilla-beta/de
[2]: https://hg.mozilla.org/releases/l10n/mozilla-beta/en-GB

MozReview-Commit-ID: CXw9aFH9psz

--HG--
extra : rebase_source : 3f92c5f3cbefbb7cea14a1f673edce546a640a96
 2017-10-03 10:29:49 -07:00
Sebastian Hengst 31c3c16fec Backed out changeset 0bf07287d614 (bug 1405404) for failing android-test. r=backout 2017-10-03 20:18:57 +02:00
Michael Comella 2e364d2e38 Bug 1405404: Add 'de' to list of pocket whitelisted locales. r=liuche 
This is used in multi-locale builds, e.g. [1] where all German is "de" but in
[2], we have a separate l10n repo for en-GB.

[1]: https://hg.mozilla.org/releases/l10n/mozilla-beta/de
[2]: https://hg.mozilla.org/releases/l10n/mozilla-beta/en-GB

MozReview-Commit-ID: CXw9aFH9psz

--HG--
extra : rebase_source : 2e921536a9347c656128fd52d6342677d359abbc
 2017-10-03 10:29:49 -07:00
Wes Kocher 83fd890d27 Merge m-c to autoland, a=merge CLOSED TREE 
MozReview-Commit-ID: HeJwJwwTzhQ
 2017-10-02 16:26:42 -07:00
Wes Kocher 382a7d90d6 Merge inbound to central, a=merge 
MozReview-Commit-ID: CvJ9hmTQBcR
 2017-10-02 16:22:37 -07:00
James Willcox 5ad5e6c258 Back out bug 1395841 - Part 2 for breaking PWA shortcut installation r=me 
This reverts commit eadc939a6ecf5eaff2a233f7015e814cc76a33ed.

MozReview-Commit-ID: 2V2oF1PC5cf
 2017-10-02 14:14:52 -05:00
James Willcox fff76b1372 Bug 1404478 - For reals send the right CPU ABI in the core ping r=jchen 
MozReview-Commit-ID: 9tM8723iqMH
 2017-10-02 13:12:43 -05:00
Eugen Sawin f2591d27c0 Bug 1316934 - [3.1] Add JNI for AudioManager properties. r=snorp 2017-10-02 17:56:17 +02:00
Atanas Minkov f2f143f706 Bug 1386990 - "change" event listener no longer required for tracking form input in session store r=JanH 
MozReview-Commit-ID: 1MhuLbvInl6

--HG--
extra : rebase_source : f74d7d080c6c5ea38efa39a2e5dc2cc82571396f
 2017-10-01 03:26:58 +03:00
Jing-wei Wu a556345663 Bug 1402882 - Update firstrun welcome image for nightly/beta/release. r=nechen 
MozReview-Commit-ID: AzV4Sl8iGc5

--HG--
extra : rebase_source : 8c8ffc53936432da7cac9ecddbe76c5ba9f9130f
 2017-10-03 15:18:04 +08:00
Wes Kocher 0196bb1eed Merge m-c to inbound, a=merge 
MozReview-Commit-ID: 9KMX1mdjylD
 2017-09-29 14:48:25 -07:00
Kyle Machulis 2ac26c5527 Bug 1403795 - Remove nsIDOMHTMLButtonElement; r=bz 
Removes the XPCOM interface for nsIDOMHTMLButtonElement, replacing it
with binding class usage.

MozReview-Commit-ID: CzqRb7lI28W
 2017-09-29 11:57:19 -07:00
Sebastian Hengst 5253bb7207 merge autoland to mozilla-central. r=merge a=merge 
MozReview-Commit-ID: 2gWLO0vz64b
 2017-09-29 13:30:42 +02:00
Sebastian Hengst 520d28af56 Backed out changeset 13e001aa0253 (bug 1395841) for altering strings without using new string ids. r=backout a=backout 
MozReview-Commit-ID: 1kApJcrN9hS
 2017-09-29 12:50:16 +02:00
Jing-wei Wu 4038891595 Bug 1403869 - Update 'about.png' for 57 Nightly. r=nechen 
MozReview-Commit-ID: IyFV77oBwRD

--HG--
extra : rebase_source : bc348cbf4429ded36218103637cff4718dcdf8b4
 2017-09-28 17:23:39 +08:00
Grigory Kruglov cd3e129cfc Bug 1404124 - Pickle account right after it's created r=eoger 
This is a relative of Bug 988605, with an exception that instead of going the whole way
and ensuring pickled data is kept up-to-date as Nick proposed, this patch simply ensures that
we pickle as soon as possible, with a goal of eliminating pickle races. The end goal is to kill
off pickling entirely, and so the assumption here is that this workaround is good enough
in the meantime.

MozReview-Commit-ID: 7IjRH7KE2Z9

--HG--
extra : rebase_source : e25b6d6baf5544d5a087cd9e12ec41d6176c317f
 2017-09-28 18:44:59 -04:00
Wes Kocher 134e495909 Merge m-c to autoland, a=merge 
MozReview-Commit-ID: 6RdWW73Lc0A
 2017-09-28 17:16:12 -07:00
Wes Kocher 1674eb3e4f Merge inbound to m-c a=merge 
MozReview-Commit-ID: 7zOjePOWzOM
 2017-09-28 16:56:44 -07:00
Jing-wei Wu 572281c97d Bug 1384870 - Show 'Folder updated' in snack bar after editing a bookmark folder. r=nechen 
MozReview-Commit-ID: GVRDKvMzop7

--HG--
extra : rebase_source : 345bbcf659fd78846a75093ecf35dc1f6533081c
 2017-09-28 14:57:49 +08:00
Jing-wei Wu 1b01c60c49 Bug 1403437 - Use MenuUtils#safeSetVisible to hide '.*_add_to_launcher' safely. r=nechen 
MozReview-Commit-ID: iraSQCSvPw

--HG--
extra : rebase_source : a7769fed5217a05da2df86745b83b859712f3aa6
 2017-09-28 11:27:46 +08:00
Grigory Kruglov 4935882f43 Bug 1403787 - Register FxA device with a default client name if we fail to obtain one r=eoger 
MozReview-Commit-ID: 85uXkFhMPFG

--HG--
extra : rebase_source : bfa407b7e3b10796962888c5d20c399d5ea2aa9d
 2017-09-28 17:43:28 -04:00
Jim Chen 549f69252b Bug 1385124 - Close tab when new tab redirects to external app; r=sebastian 
When a site opens link in a new tab that redirects to an external app,
we should close the new (empty) tab and return to the previous page.

MozReview-Commit-ID: KXWA2d26RBh

--HG--
extra : rebase_source : 601dd7a26b070102c7785f68bf2f3fec3f6f003b
 2017-09-27 16:47:13 -04:00
Jim Chen 9bc80ca4da Bug 1384829 - 4. Add test case to testInputConnection; r=esawin 
Add a test case to testInputConnection that makes sure GeckoEditable's
Editable interface still behaves correctly even after disconnecting from
Gecko due to a blur.

MozReview-Commit-ID: 7Z6Kpv2tpRy

--HG--
extra : rebase_source : 9ec338c77d362a86fb0097b51bd4d55a15654f43
 2017-09-28 00:14:19 -04:00
Jim Chen e1cb3acc74 Bug 1384829 - 3. No longer ignore certain exceptions; r=esawin 
Bug 817386 added code to ignore IndexOutOfBoundsException when using
GeckoEditable because the code wasn't mature enough back then, and there
were many race conditions. I think the situation is a lot better now, so
we can try removing that code and see if we still need it. We can always
add it back if we do.

MozReview-Commit-ID: 4pirfaUuSNu

--HG--
extra : rebase_source : ed68d545bb5e40491720aeafe86221163c064449
 2017-09-28 00:14:18 -04:00
Jim Chen 67f61c4e8a Bug 1384829 - 2. Add more user-friendly debugging output; r=esawin 
Translate non-ASCII characters into hex instead of trying to print them
out.

MozReview-Commit-ID: 1aABRy6J1nm

--HG--
extra : rebase_source : f620d35e3cff12ab60e48568f33af65ad4f493c8
 2017-09-28 00:14:18 -04:00
Jim Chen 107658fdda Bug 1384829 - 1. Always perform shadow text actions; r=esawin 
We want to always perform actions on the shadow text side even if a
particular GeckoEditable instance is disconnected from Gecko, because
there could be other users of Editable that still expect the object to
perform valid actions.

MozReview-Commit-ID: 48OIEaPZqUE

--HG--
extra : rebase_source : 1ab86138c81061aeb7ea600497af5290581a9fbc
 2017-09-28 00:14:18 -04:00
Hugh Wu 5317a6d9c6 Bug 1381747 - Removed browser.display.history.maxresults from mobile.js. r=JanH 
MozReview-Commit-ID: EBfNr65hiaR

--HG--
extra : rebase_source : a4cf3165928f2ea1d86248b695b82583062b59c3
 2017-09-15 18:23:11 -04:00
Jing-wei Wu 2baa51b8c6 Bug 1395841 - Part 2: Support creating a shortcut from page option in menu. r=nechen 
When page option 'add page shortcut' is clicked, creating a shortcut(not PWA) on launcher.
Also make sure that heavy tasks are executed in background thread.

MozReview-Commit-ID: 8KtwdXENtEd

--HG--
extra : rebase_source : 12a427f549a41f9d8650b4b8d95394bdc4192c4b
 2017-09-28 10:57:48 +08:00
Jing-wei Wu fa9bbb0da2 Bug 1395841 - Part 1: Change page option strings fom 'add to home screen' to 'add page shortcut'. r=nechen 
MozReview-Commit-ID: 9fFN9aYEI3v

--HG--
extra : rebase_source : ba6edcd624eef98423783c84216dc42cc24cabd5
 2017-09-27 17:31:30 +08:00
Jing-wei Wu 69bc7bda88 Bug 1399378 - Update Fennec logo icons for 57 beta/release. r=nechen 
MozReview-Commit-ID: CUy4RSuiRnD

--HG--
extra : rebase_source : f6c9486833bacfd89fbd404bbd65997a2a44ee23
 2017-09-28 17:08:56 +08:00
Wes Kocher 253017b382 Merge m-c to inbound, a=merge 
MozReview-Commit-ID: 9qR4QYHAi2x
 2017-09-28 17:08:09 -07:00
Jim Chen 101c7645ef Bug 1258106 - Extend testEventDispatcher timeout; r=me 
Extend timeout for testEventDispatcher to 40 seconds and fix a bug where
the wrong mode is used for event callback tests. r=me for trivial
test-only fix.

MozReview-Commit-ID: JiyW8lFW8kg
 2017-09-28 18:26:06 -04:00
Eugen Sawin 2cf5f3c9c5 Bug 1394520 - [3.0] Translate null-URI to "about:blank" for URI loading requests. r=snorp 2017-09-28 22:45:59 +02:00
Eugen Sawin fd55cf9695 Bug 1394520 - [2.1] Add support for external URI loading with e10s in GeckoView. r=snorp 2017-09-28 22:45:41 +02:00
Eugen Sawin fbf9ec3f92 Bug 1394520 - [1.2] Extend nsIBrowserDOMWindow to support content window creation without URI loading with e10s. r=smaug 2017-09-28 22:45:24 +02:00
Mike Shal 9e6798ac00 Bug 1402012 - Update buildconfig.py to use PartialConfigEnvironment; r=glandium 
By using the PartialConfigEnvironment, the clients of buildconfig will
depend on config.statusd/ files instead of config.status directly.
Clients can access substs and defines using buildconfig.substs['FOO'] or
buildconfig.defines['BAR'], and then collect file-level dependencies for
make using buildconfig.get_dependencies(). All GENERATED_FILES rules
already make use of this because file_generate.py automatically includes
these dependencies (along with all python modules loaded).

As a result of this commit, re-running configure will no longer cause
the world to be rebuilt. Although config.status is updated, no build
steps use config.status directly and instead depend on values in
config.statusd/, which are written with FileAvoidWrite. Since those
files are not official targets according to the make backend, make won't
try to continually rebuild the backend when those files are out of date.
And since they are FileAvoidWrite, make will only re-run dependent steps
if the actual configure value has changed.

As a result of using JSON to load data from the config.statusd
directory, substs can be unicode (instead of a bare string type).
generate_certdata.py converts the subst manually to a string so the
value can be exported to the environment without issue on Windows.

Additionally, patching the buildconfig.substs dict no longer works, so
the unit-symbolstore.py test was modified to patch the underlying
buildconfig.substs._dict instead.

The other files that needed to be modified make use of all the defines
for the preprocessor. Those that are used during 'mach build' now use
buildconfig.defines['ALLDEFINES'], which maps to a special
FileAvoidWrite file generated for the PartialConfigEnvironment.

MozReview-Commit-ID: 2pJ4s3TVeS8

--HG--
extra : rebase_source : d6bb0208483f9f043e7be1b36907ca13243985f8
 2017-08-24 22:52:01 -04:00
Grigory Kruglov 772b49aa9a Bug 1404543 - Update copy and default values for 'sync over wi-fi' pref r=nalexander 
Switching key name/default value means that we'll drop this pref for some _very_ early
adopters of this feature on the nightly channel, but that's why it's a nightly channel.

MozReview-Commit-ID: KtQmmFFPDPR

--HG--
extra : rebase_source : 725eae2a95e129eba6023eb69ebafbb19226698b
 2017-10-02 15:25:40 -04:00
Michael Kaply 681fb539f1 Bug 1401282 - Don't assume the intent has an action. r=snorp 
MozReview-Commit-ID: LYayQCljEP4

--HG--
extra : rebase_source : 5fb809811d85c8c5708dd6a02f866671b682b97c
 2017-09-29 16:12:38 -05:00