Commit graph

724 commits

Author SHA1 Message Date
James D. Forrester 0db318f462 Update VE core submodule to master (b04645ac8)
New changes:
3738f1584 ve.ui.TargetWidget: Emit an event to allow last-minute setup
e70e717e0 Update AUTHORS.txt for the last couple of years' work
6393da80b Localisation updates from https://translatewiki.net.

Bug: T157084
Change-Id: Ie2da62d0c06209e5b21c186f1f50be42bbe014d8
2018-01-04 08:53:13 -08:00
James D. Forrester 39e193dd20 Update VE core submodule to master (9d7035436)
New changes:
5e96bf362 doc: Bump copyright year
172ac9f0b Convert single nbsp's to plain spaces on paste

Bug: T183647
Change-Id: I8359ccb27deb42f017b411b57658401bc5376f61
2018-01-03 11:30:51 -08:00
James D. Forrester 0351e6cb21 Update VE core submodule to master (8c5e78c7f)
New changes:
7b24c338b Fix stale comment
288e6cffd Unbreak tests after Chrome upgrade
61c2bb7c0 Follow-up c7ef30a30f6: append multi-element nodes in the right order
be89723c6 ve.ce.DocumentNode: Documentation fix
7a5288231 ve.ui.DesktopContext: Do not flip the popup
e2b755b9f Localisation updates from https://translatewiki.net.
744af85b0 Update OOjs UI to v0.24.4
8c5e78c7f Comment out broken test after Chrome upgrade

Bug: T182907
Bug: T183590
Change-Id: Ie08c04c137e9927b78642d4b8b75f914f9758187
2018-01-03 16:09:06 +01:00
David Lynch 5bbda2b8c8 ArticleTargetEvents: Track editor mode on save events
Bug: T182610
Change-Id: I8b58bea8e4444478cde4c1340d13ddf97aab8f01
2017-12-14 16:23:08 -06:00
James D. Forrester efaf914617 Update VE core submodule to master (cd6bce192)
New changes:
8f9a3d713 Localisation updates from https://translatewiki.net.
2d9987ade Update RuboCop Ruby gem
3c7276672 Use rel="noopener" on links targeted at new windows
2a1316fcc Don't execute commands twice
3c547f413 Localisation updates from https://translatewiki.net.

Bug: T180878
Bug: T180932
Bug: T182270
Change-Id: Ifdbf40d4bc27f10c30e2e5d03fb569eef754defb
2017-12-07 08:07:39 -08:00
James D. Forrester 9b51a3615b Update VE core submodule to master (789451511)
New changes:
f91a80008 build: Bump Ruby cruft to avoid security warnings for old rubocop
c89c238dc Fix insertion annotations in source mode

Bug: T181726
Change-Id: I92dd60ec3adbe261ce4c47942150bff162b8149a
2017-12-01 15:49:56 -08:00
James D. Forrester 763e5f8078 Update VE core submodule to master (49b182123)
New changes:
3fa757520 ce.Surface: support formatted google docs paste content again
52d849e6b ce.Surface: more tests for Google Docs pasting
49b182123 Update OOjs UI to v0.24.3

Bug: T145252
Change-Id: I5ceeeae946873cd1fdc692ce37c81b22e1973a89
2017-11-28 16:45:42 -08:00
James D. Forrester 15d3a771e9 Update VE core submodule to master (56cfb5d6f)
New changes:
00589df33 ce.ContentBranchNode: Move setNotUnicorning into detach
70a56d30a Destroy CE nodes on removal by onSplice

Bug: T179574
Change-Id: Ib0217c0f089dc9423776805f1bf31f1f16c68beb
2017-11-28 09:54:42 -08:00
James D. Forrester 11993d8822 Update VE core submodule to master (6c0b7407f)
New changes:
c56a4eef5 Localisation updates from https://translatewiki.net.
71da5d798 Localisation updates from https://translatewiki.net.
36811a12e TableAction: Add option for creating a table with a caption
7979ceb97 DebugBar: Debounce onHistory handler
505f06d2e Highlight table caption when table cells selected
3f1cc6cb0 Localisation updates from https://translatewiki.net.

Bug: T181173
Change-Id: Id8999ac2cb15484e9eed7a1db194152d56816420
2017-11-27 08:35:25 -08:00
James D. Forrester 40b118e642 Update VE core submodule to master (cca896ac3)
New changes:
c7ef30a30 Get a ve.ce.BranchNode position's corresponding DOM position
5f9b3f5d1 Localisation updates from https://translatewiki.net.

Change-Id: I3456a20420153b1c31fa39b0541f6b93b7d582ec
2017-11-16 16:07:52 -08:00
James D. Forrester cad54feb77 Update VE core submodule to master (7d7966df9)
New changes:
b879aeea1 git.wikimedia.org removals
f76f117ed Revert "git.wikimedia.org removals"
2f9ce8de8 ce.Surface: on paste, make sure clipboardKey spans don't show up
8d55f4ac9 Localisation updates from https://translatewiki.net.
c82f7171f Localisation updates from https://translatewiki.net.
d9059cd50 Fix visual diff timeout
f1dd4ce13 Update RangeFix 0.2.3 -> 0.2.6
51d90bd19 Update UnicodeJS to v0.2.0
7d7966df9 Follow-up 51d90bd1: Also update README.md

Bug: T121588
Bug: T139089
Bug: T177378
Change-Id: If90a6fee33759be9355d966f9ccd648d2a12003d
2017-11-15 15:07:47 -08:00
James D. Forrester 79c89409f3 Update VE core submodule to master (bf37a87d2)
New changes:
8c9e847f6 Actually use the CE node while waiting for the DM render
bf37a87d2 Update OOjs UI to v0.24.2

Bug: T179870
Change-Id: I41cefdc9d4cfe741193542b3fa48bdae9e65d525
2017-11-07 16:54:11 -08:00
James D. Forrester 603c4dae09 Update VE core submodule to master (a6b982d8a)
New changes:
fd01de26b Fix typo/spelling (use en-US)
c7ed230f1 Convert empty doc to empty string in convertToSource
00e344e09 Localisation updates from https://translatewiki.net.
837c20ac8 Unify SVG markup

Change-Id: I9a5f471632ac7f908d877fa312b7e5280b1e6ba4
2017-11-06 11:16:34 -08:00
Ed Sanders f86766a276 Update VE core submodule to master (6741337)
New changes:
0261c91 Localisation updates from https://translatewiki.net.
5043c49 ve.ui.Surface: Fix documentation for #getDom
d6fece6 Localisation updates from https://translatewiki.net.
5b46356 ve.BranchNode#setDocument: Fix highly misleading comment
0cb8c98 Update OOjs UI to v0.24.1
2b401cf Localisation updates from https://translatewiki.net.
e36f398 Add method for converting plaintext offsets to source-mode offsets
6741337 Fix typo in unit test

Change-Id: I1071faeec586fa2b44be810a35f8044800c8f800
2017-11-04 21:20:19 +00:00
James D. Forrester 9e185b8d54 Update VE core submodule to master (8d1c0d026)
New changes:
8581e9d86 LinearEnterKeyDownHandler: Enter behavior in nested lists
a91e77764 build: Put karma coverage reports in the top-level directory
81a88b4f1 build: Replace JSON code coverage report with clover.xml one

Bug: T108595
Change-Id: Ic5d83417d64126d9a27d46504fc8fcd338cd7f21
2017-10-26 15:57:01 -07:00
James D. Forrester 854120206c Update VE core submodule to master (9b32da86d)
New changes:
9c1134b1b Localisation updates from https://translatewiki.net.
ccf83d4ed Localisation updates from https://translatewiki.net.
a13b7efa5 Fix infinite recursion in standalone diff dialog
cfdb6ac45 build: Bump various devDependencies to latest
4d8f80c6c build: Bump unit test-related devDependencies
385d6119a Scroll to the next highlight after find and replace has replaced text

Bug: T177514
Change-Id: Icb79a79d3bcde9337938d989d7cd93b3a74dd913
2017-10-25 11:29:12 -07:00
James D. Forrester 7f128219b5 Update VE core submodule to master (28e34c1d7)
New changes:
f549faef9 Revert "ve.ui.LinearContextItem: Workaround for T178336"
952faad32 Update OOjs UI to v0.24.0

Change-Id: I76d27222edb29ee9685c7b8807068ac7c99536d9
2017-10-17 18:00:37 -07:00
James D. Forrester a00e921a7a Update VE core submodule to master (ea5179857)
New changes:
f5ffe3713 Localisation updates from https://translatewiki.net.
7a829c165 Fix CSS for context menus after changes in OOjs UI
6d90b80c1 ve.ui.LinearContextItem: Workaround for T178336

Bug: T178324
Change-Id: Ifb4c592b506974d020de64d71388d0f20560b299
2017-10-16 14:56:31 -07:00
James D. Forrester ab41fc154d Update VE core submodule to master (df62df432)
New changes:
539f1fd80 Update OOjs UI to v0.23.4
4dda3b936 Notification for DM node attached/detached
df62df432 Update OOjs UI to v0.23.5

Bug: T162761
Change-Id: Id1a159ecac246dd067b83bbe86f4b163bde83e8c
2017-10-12 14:59:57 -07:00
James D. Forrester 343a701315 Update VE core submodule to master (33e74b92f)
New changes:
33e74b92f ve.ce.Surface: When destroying, blur before disconnecting model events

Bug: T166634
Change-Id: I0f638aff7e46f0972517ad22f5cb97c330298308
2017-10-12 07:12:29 -07:00
James D. Forrester 762bcba783 Update VE core submodule to master (e8188bac8)
New changes:
2043917fd Upgrade DOMPurify 0.8.5 > 1.0.2
aa7b09537 Add <figure-inline> and [srcset] to DOMPurify exceptions
18d96af78 ce.Surface: handle table-adjacent observed selection changes better

Bug: T148679
Bug: T176936
Change-Id: I40bf5210816bc34aa4a13dcf957272cfd44fe07d
2017-10-11 08:15:02 -07:00
Roan Kattouw 48826bd0f0 Update VE core submodule to master (c5c5123)
New changes:
1c8ca38 Don't assume events have an originalEvent object
c5c5123 Localisation updates from https://translatewiki.net.

Bug: T176104
Change-Id: I2e503ee6b3d4484a4f1b3567fde7281bef68a7b9
2017-10-09 13:59:54 -07:00
James D. Forrester 307f6c605b Update VE core submodule to master (4e29d197d)
New changes:
b64a2a6db Replace abandoned colors wo WikimediaUI palette ones
4e29d197d Align `border-radius` to WikimediaUI Base values

Change-Id: I8c1d68346ba189cf77f004553923c21b405a33e7
2017-10-06 18:15:31 -07:00
James D. Forrester 0b574b88b8 Update VE core submodule to master (0c062b9b2)
New changes:
0aa3e79d2 Update OOjs UI to v0.23.3
0c00812bc Localisation updates from https://translatewiki.net.
0c062b9b2 Cleanup target teardown API

Change-Id: I41e07963a6565ed29752645ae8acf64350daa677
2017-10-05 10:26:05 -07:00
James D. Forrester 8c611571d8 Update VE core submodule to master (cb52d8b7a)
New changes:
46c8b6ec8 ce.Surface: in observed selection changes, only make cursorable selections
0c76240a4 Localisation updates from https://translatewiki.net.
cb52d8b7a Follow-up Iea80013: Re-define this.$bounding after GCN re-render

Bug: T148679
Bug: T176766
Bug: T176936
Change-Id: I3b6e156e007a7bdda427225f6c85d1a7ebca3f41
2017-10-02 10:55:01 -07:00
James D. Forrester fb053d1418 Update VE core submodule to master (84ec68dfb)
New changes:
ade04f53b Highlight locale substring match in language search
6b21b1962 Unify monospace font family stack
015d19968 Detach icon before updateInvisibleIcon
5092d2e8c Follow-up Iea80013: $attachable -> $bounding
a564d5ace Localisation updates from https://translatewiki.net.
84ec68dfb Make a clear API for setting inspector padding

Bug: T176636
Bug: T177080
Change-Id: Ia8fea335a41342fcdb86fd691966624ce57e95e3
2017-09-29 12:26:00 -04:00
James D. Forrester a66dc4ad4f Update VE core submodule to master (8184ce0f9)
New changes:
0a45d669c Replace constructive with progressive UI flag
4ff90218d ve.ce.Surface: Fix typo in documentation
605752edb Update OOjs UI to v0.23.2
7bcb9084b Do not setup inline slugs when rendering is locked

Bug: T176762
Change-Id: Ic8b8a0209306e4fabfbffd809d3f203cb1472cc9
2017-09-26 23:12:16 -04:00
James D. Forrester 671501930c Update VE core submodule to master (723b85d6c)
New changes:
02ac1e72b Allow focusable nodes to define an element to be their bounding box

Bug: T176646
Change-Id: I19480544a9e67d29ef92ffaf2ed3ca4c733b733d
2017-09-25 13:16:51 -04:00
David Lynch 8b1370f1d7 Update VE core submodule to master (0ec5fe55f)
New changes:
46f521752 Use findFirstSelectableitem instead of getFirstSelectableItem
3a64969b9 Setup slugs in TreeModifier
86c4df845 Update OOjs UI to v0.23.1
74c1020e1 Surface: reset selection when popping staging
754c5cf63 Localisation updates from https://translatewiki.net.
55955bdff Use diacritic insensitive search in language search dialog
deaf03272 Localisation updates from https://translatewiki.net.
8d639dcd8 Make IME tests more consistent across test environments

Bug: T166134
Bug: T175852
Bug: T175943
Bug: T176453
Change-Id: If101bd348a659d2954b28ca4b94dac66b8197ce3
2017-09-25 10:43:14 -04:00
James D. Forrester 3b78edae26 Update VE core submodule to master (75726b850)
New changes:
c23696d7e ve.ce.Surface: Make attribute resolution consistent with ve.ui.PreviewElement
a45d6fc3e Localisation updates from https://translatewiki.net.
7070899bd Follow-up a45d6fc3: Add 'tay' language to build to unbreak the repo

Change-Id: I684b6ca6a99292fc653d8efdf8e99db2655ae057
2017-09-18 16:10:07 -07:00
Ed Sanders 31122758bb Remove unused polyfills from EasyDeflate lib
Base64 and TypedArrays polyfills were required to
support IE9, but VE now requires IE10.

* http://www.caniuse.com/#feat=atob-btoa
* http://www.caniuse.com/#feat=typedarrays

Change-Id: I311a16f98fb1d091f55dda52d97bebfc012e2a14
2017-09-15 15:57:55 +01:00
James D. Forrester f07b6e72cb Update VE core submodule to master (05439f5b7)
New changes:
8c64fe2b5 VisualDiff: Show minimal moves in diff
85a6489ee Localisation updates from https://translatewiki.net.
c20e589d5 Fire position event when direction is changed
32bc67544 Fix AuthorListPopupTool's surface setting
7ff9a3a4e Correct inheritance for CommentInspector actions
05439f5b7 ui.TableLineContext: fix z-index for menu

Bug: T169389
Bug: T171451
Change-Id: Ib8046bd830572829541946f3539a9fcb447cf76f
2017-09-14 14:24:03 -07:00
James D. Forrester 82469cccf1 Update VE core submodule to master (7028f79aa)
New changes:
dd2251b73 Capture format* inputTypes
d5a375850 Follow-up 8e795e4331: Fix typo in HistoryTool#onSurfaceChange
307746d50 Follow-up Ifcc2e6f: Emit surfaceChange after tool setup
71f2586f6 Make ve.dm.Change part of core module
0053801c7 Remove server-only scripts from visualEditor.rebase

Bug: T175734
Bug: T175828
Change-Id: Ie011224ce5d6474b37961b32d057861929c3ffb5
2017-09-13 08:29:52 -07:00
James D. Forrester 7dcf2474c2 Update VE core submodule to master (dafc7bbe5)
New changes:
4aadbc518 Remove 'return' mapping as it is aliased to 'enter' below
0942f2071 ve.ce.BranchNode#splice: disconnect nodes fully

Bug: T175548
Change-Id: Ifa0933b9dac377fc8f038f6586e82c2f94473639
2017-09-12 11:26:09 -07:00
Ed Sanders faf852f335 Update VE core submodule to master (f88cd00a6)
New changes:
c1c38136d ui.TableLineContext: adjust positioning
37d0c2747 Trigger proper undo/redo when inputType=historyUndo/Redo
8b7fc6fcc Make special keys translatable

Bug: T175417
Bug: T175449
Bug: T175634
Change-Id: Ic663108ff19ea90adc9b033f6df1f0feac7994a6
2017-09-12 09:27:02 -07:00
James D. Forrester 92ca696f5a Update VE core submodule to master (02a2ea954)
New changes:
5b0c644ce Localisation updates from https://translatewiki.net.
20075fa86 Rebaser: Rename author to authorId consistently
e70a4632e lint: Remove unnecessary parentheses
358ef33da ve.ui.Surface: Documentation type hint fix
4b1eec402 Localisation updates from https://translatewiki.net.
2fabe9fe8 i18n-bot fix
02a2ea954 Fix editing figcaptions in Firefox

Bug: T174774
Change-Id: I6beaa9ba8b266b5b53bd6ddc3301ff52ce69bbd5
2017-09-11 13:17:38 -07:00
James D. Forrester d9739c0b2e Update VE core submodule to master (834fd702f)
New changes:
86bd6c879 Localisation updates from https://translatewiki.net.
6d7a4cef0 Update OOjs UI to v0.23.0
37d1512a7 TransactionProcessor: modify DM tree branches instead of rebuilding them

Bug: T162762
Bug: T166041
Bug: T167027
Change-Id: Idfaa990dd940e26d7d572513220282bc97ca65fa
2017-09-06 13:44:33 -07:00
James D. Forrester a18508e7e4 Update VE core submodule to master (7a8829509)
New changes:
4523b11c0 Make RebaseServer asynchronous
2eb09b6ba Localisation updates from https://translatewiki.net.
c806b7131 Remove execute mode from non-executable
622c62c9e Follow-up 2eb09b6b: Add kab to build to unbreak the repo
b69e4ba1c DiffElement: Fix insert/delete-to-end loops
8c6dfdde9 FocusableNode: Redraw highlights using focus toggle
2bded2d16 Debounce FocusableNode#redrawHighlights
3cb7844b1 Localisation updates from https://translatewiki.net.
fb13239b2 VisualDiff: Don't diff close elements
7a8829509 Localisation updates from https://translatewiki.net.

Also, exempt the Rebaser ES6 code from jsduck, as we do in VE itself,
because jsduck doesn't understand ES6 syntax.

Bug: T129541
Bug: T171862
Bug: T173860
Change-Id: Ia08022afb0b94b8a6907f97b161bc04d8a210232
2017-08-31 11:39:36 -07:00
James D. Forrester 5ad4f6f7ff Update VE core submodule to master (d7bb71b95)
New changes:
1a726e3ed VisualDiff: Show internal list remove-inserts
94532edbf Update OOjs UI to v0.22.5
feb2ca706 Don't try to close context while opening

Bug: T171377
Bug: T173077
Change-Id: Ifced78dd25c218d671e1bb4d08ee7494ec0bf808
2017-08-23 08:22:27 -07:00
Umherirrender 9108ac69ee Update VE core submodule to master (6111ca575)
New changes:
6111ca575 Use json extension for .stylelintrc

Local changes:
Use json extension for .stylelintrc

Bug: T173516
Depends-On: Iba3b6cb37c458e896ade0f3a57a02540b4b4a0a0
Change-Id: I977ac6816e97cfb37bb2e0187e9d148bdb2148af
2017-08-21 11:28:34 -07:00
James D. Forrester a09ab8d679 Update VE core submodule to master (72cc043b7)
New changes:
c0ce8519c ce.GeneratedContentNode: helper for waiting for generation
fec19de11 Use version 0.5.0 of eslint-config-wikimedia
5716d2bb2 Localisation updates from https://translatewiki.net.
385d925ed Follow-up 5716d2bb2c: Add ko-kp to build to unbreak the repo

Bug: T168932
Change-Id: I50fcf1cb3f517b50dc373243dd876bc117030790
2017-08-21 07:32:53 -07:00
James D. Forrester b296882bb8 Update VE core submodule to master (4314b9ead)
New changes:
4ff864094 VisualDiff: Merge old internal list into new document
4314b9ead ve.ce.BranchNode.css: Correct dated comment about styling

Bug: T173100
Change-Id: I68d95d0ce809481f45583eac5d9f4562826b2314
2017-08-12 17:22:19 -04:00
James D. Forrester b8c81778ad Update VE core submodule to master (81a4760ea)
New changes:
e100628de build: Ignore package-lock.json for fewer surprising npm outcomes
3764b2c60 Localisation updates from https://translatewiki.net.
c62271fbd Localisation updates from https://translatewiki.net.
8517f4c0a Localisation updates from https://translatewiki.net.
0ca19ca2c Localisation updates from https://translatewiki.net.
79cfd3119 Follow-up 0ca19ca2c6: Add skr-arab to build to unbreak the repo
81a4760ea VisualDiff: Refactor for historical diffs

Bug: T170269
Change-Id: I4ed78533be41317e12cd1d94af902323475af68b
2017-08-10 16:04:30 -04:00
James D. Forrester 694681b336 Update VE core submodule to master (18ae4004f)
New changes:
887ebb1a4 Clarify comments that certain 'html' parameters must be whole documents
cc50757ee LinearTabKeyDownHandler: Abort if modifiers are used
23f70f760 jsduck: Explcitly name library files so we don't pull in CSS files
18ae4004f Update OOjs UI to v0.22.4

Bug: T171600
Bug: T172168
Change-Id: I2510174db0f650113702674e37e768aa558f02cc
2017-08-01 15:11:26 -07:00
James D. Forrester 57636de7ab Update VE core submodule to master (4d6745b2f)
New changes:
d7ca44b84 Localisation updates from https://translatewiki.net.
addd343a0 Localisation updates from https://translatewiki.net.
0ca48126b Abstract definition of type equality when comparing inline nodes
8c9e9dd0a Disable Grammarly
9eb3f29cb Don't throw an exception if observed annotation is alien to us

Bug: T165746
Bug: T166801
Change-Id: I6b8f60432352c468e8c3f2946802ac33d1e9604f
2017-07-31 12:08:26 -07:00
James D. Forrester f84a931a4e Update VE core submodule to master (f444fa19b)
New changes:
d23bd1e79 Localisation updates from https://translatewiki.net.
71807dedb Localisation updates from https://translatewiki.net.
fdac5539b Doc comment improvement to ve.ui.LanguageInputWidget.
22f2e8531 ve.ce.Surface: Fix lint error
66cbb1c34 Remove unnecessary mixin from standalone image caption node
3bed3398c Default table cells to ce=false, and always set ce state to editing state
22e4c16dd Generate heading1-6 commands in a loop

Bug: T171728
Change-Id: I02883793afb120cd3751988bb11b4068af0bd317
2017-07-26 16:54:58 -07:00
James D. Forrester e9aa31b9b6 Update VE core submodule to master (be80158a9)
New changes:
e5603a38f Fix indentation of internal list diff spacers

Bug: T171055
Change-Id: I2c646baafd525bfea581e3882ec977885f8c3b65
2017-07-20 12:32:41 -07:00
James D. Forrester f9fc275877 Update VE core submodule to master (154f192b3)
New changes:
86913b32a build: Upgrade QUnit to 2.x
af71dc077 tests: Simplify Platform test beforeEach/afterEach logic
951fd9293 build: Upgrade grunt-eslint from 19.0.0 to 20.0.0
e3bb4aa55 Unset surface active node if destroyed
ca5fddf9b tests: Move QUnit fiddles to VE-core-only file

Bug: T170585
Change-Id: I741bc01734922e9df15fbab870000ffaa173110e
2017-07-18 12:31:26 -07:00
James D. Forrester 6b2909a9e5 Update VE core submodule to master (31ed22557)
New changes:
9ba233409 VisualDiff: Use <del> and <ins> on whole paragraphs
8d9068029 Update OOjs UI to v0.22.3
9a0582038 Use white-space:pre-wrap for text changes
d12bb03d7 Avoid deprecated QUnit.asyncTest() in ve.init.sa.Platform.test
a0a86ff48 tests: Avoid deprecated QUnit.push()
91e20c05c Localisation updates from https://translatewiki.net.

Bug: T170114
Bug: T170136
Bug: T170585
Change-Id: I50c45fc9826a21810ebd4f4fed5f7b0acb341d13
2017-07-16 13:49:54 -07:00
James D. Forrester 19c95f93a9 Update VE core submodule to master (c9b0d1a23)
New changes:
56e7afa47 Follow-up I93bb2b5dcc: Insert newline if fragment ends in '/paragraph'
70b378298 Workaround for Flow bottom toolbars conflicting with inspectors
c9b0d1a23 Workaround for nested toolbars hack being terrible

Bug: T169076
Bug: T169617
Change-Id: I69dd105d26edcbec8136fbafd337462478ab3349
2017-07-10 15:25:24 -07:00