Ed Sanders
da49448f43
Poll for new comments in the section you are replying in
...
Bug: T300504
Change-Id: I3a887ab2f5260bb4893a3d680103c9d8ec767f45
2022-03-04 00:40:29 +00:00
Bartosz Dziewoński
be74938855
Warn when target comments in a link can't be found
...
Links are generated to:
* Single comments, by a user or by a notification
* Potentially multiple comments (new comments since T),
usually just by notifications.
If in either case no comments are found to highlight, warn the
user so they get some visual feedback that the notification worked
as expected, but that the comment was just deleted since.
Bug: T301602
Change-Id: I090c904481cf6f3e9f964fa43b10001e75b0bc90
2022-02-28 21:58:59 +00:00
Translation updater bot
77034e77c2
Localisation updates from https://translatewiki.net .
...
Change-Id: I2f0cac5dd1cefeb2af78920aa0096882bbcfb64f
2022-02-16 08:12:56 +01:00
Ed Sanders
025130fcd2
Don't prompt to reload the page if the reply widget is open
...
Only show the reload prompt if the 'disappeared' error is detected
when the reply widget is loading. Don't show it if we failed
to save, as it suggests you will not lose content if you reload.
Change-Id: I106f274e180dc97b540d729e31aae575c43f29f0
2022-02-07 22:45:35 +00:00
Translation updater bot
dd9b3d517e
Localisation updates from https://translatewiki.net .
...
Change-Id: Ifae61fbc15016e3947fdf6d7da05c227ea066b83
2022-02-01 08:26:56 +01:00
jenkins-bot
4a0db2ae45
Merge "Add an optional suffix message to mentions"
2022-01-21 00:36:15 +00:00
Translation updater bot
4b138f128f
Localisation updates from https://translatewiki.net .
...
Change-Id: I2842ad13ded091c3ed7c1c88763304937f3272cc
2022-01-20 09:17:31 +01:00
David Lynch
dccaa5bf65
Add an optional suffix message to mentions
...
Wikis like jawiki will then be able to customize the message to include
honorifics as they think appropriate.
Bug: T268588
Change-Id: I213fb9fd0a9ed6592ce3548a5b2c3b11a55c1abc
2022-01-19 10:29:10 -06:00
Translation updater bot
10acc0ea8f
Localisation updates from https://translatewiki.net .
...
Change-Id: I1ccc84bee60d1d89b33b8981c995dcb3b0455cad
2022-01-18 08:10:49 +01:00
Bartosz Dziewoński
d0eec56f6d
Show a hint on legacy interface when arriving from new topic tool hint
...
Bug: T293962
Change-Id: I56823efb4e58839b3f121ff23d576984b86e4e81
2021-12-16 17:43:23 +00:00
David Lynch
f24a73a05a
Show a hint on the new topic tool to explain that it's new
...
This shows to users who are logged in and have more than 500 edits
Bug: T293962
Change-Id: Ic47fa897c6a4f43c27d4cfd5571e34f8acb01eb8
2021-12-16 16:01:38 +01:00
Translation updater bot
2b8f245e2c
Localisation updates from https://translatewiki.net .
...
Change-Id: Ie8e895f02b252b8fc147e4a4c478321b3e6a0b62
2021-12-06 08:18:58 +01:00
Ed Sanders
adf9f8dc88
Messages for Automatic Topic Subscriptions feature
...
Extracted from Ia42ad0872 and I9f933671.
Change-Id: I9b3e563071d879c0592bfbaab0d944b546cb5ee9
2021-11-15 18:21:37 +00:00
Bartosz Dziewoński
312cce03db
Add links to Special:TopicSubscriptions in preferences
...
Bug: T294994
Change-Id: Ifd564f435e300232d220896e5a29bd8f43db326c
2021-11-04 19:51:08 +01:00
Translation updater bot
5006e938fb
Localisation updates from https://translatewiki.net .
...
Change-Id: I72ea77f58b2e3e6ed0b7cb8520ffea2fa89eddca
2021-11-01 09:33:31 +01:00
Translation updater bot
ff9512178f
Localisation updates from https://translatewiki.net .
...
Change-Id: Ia9ac49eba82e57f4f2a0892034c5c79907b0cc03
2021-10-29 08:21:41 +02:00
jenkins-bot
5bccc9452c
Merge "TopicSubscriptions: Rename 'actions' column and unframe button"
2021-10-28 21:05:43 +00:00
Translation updater bot
4a5b1874f7
Localisation updates from https://translatewiki.net .
...
Change-Id: Iace040cd46e1f089d1a0dc9c874a9563ee99bdbd
2021-10-27 08:22:01 +02:00
jenkins-bot
e5f8b1fe47
Merge "Replace marker comment with limit report data"
2021-10-12 15:20:13 +00:00
Ed Sanders
7f16b7a4c2
TopicSubscriptions: Rename 'actions' column and unframe button
...
Bug: T273342
Change-Id: Ifd18551e0d89e5c0d4cebd022afebb9a31e2619b
2021-10-12 14:06:57 +01:00
Ed Sanders
02642e48dd
Fix linting on i18n key order
...
Change-Id: Id30b228f2aaa710f75086b6b64ffda5726d59a8e
2021-10-07 17:37:51 +01:00
Bartosz Dziewoński
e3af0bc65b
Replace marker comment with limit report data
...
We always do our processing in the parser now, so we don't need the
marker comment to detect whether we've already processed the page.
Bonus: include the time taken by our processing in the limit report.
Bug: T291831
Change-Id: Ife7ddffbad1b1495b004739212002a98fdebe6c0
2021-10-07 17:59:10 +02:00
Bartosz Dziewoński
a0dc12ab56
Add Special:TopicSubscriptions
...
Bug: T273342
Change-Id: If96a0df1efbf5cadfb6bf2bf8f7ad5c9c90ea142
2021-10-06 20:06:01 +00:00
Bartosz Dziewoński
ca8781a3a0
Add a link to preferences within the Reply and New Discussion Tools
...
Bug: T291002
Change-Id: Id99f77d3a181aedd23305b7afa61a0a3fb6dabb7
2021-09-27 21:52:07 +00:00
Bartosz Dziewoński
b6c8de03ef
Change the "Watch this page" label to distinguish it from topic subscriptions
...
Bug: T290712
Change-Id: I02b89466a4e980e3cb2859b1ba5a3cbf4b5ae0ed
2021-09-21 11:44:06 +02:00
Translation updater bot
61d5b624ae
Localisation updates from https://translatewiki.net .
...
Change-Id: Ia92bf13ab44a2ec8d55b1df4f059a0da8ab254da
2021-08-30 08:20:05 +02:00
David Lynch
21600231d9
Empty states for anon/IP user talk pages
...
Bug: T287779
Bug: T288556
Change-Id: I9d01d1ac04c0cc443c4cbfe94d301db16f5b1ef6
2021-08-26 22:11:13 +02:00
David Lynch
e85795446b
Empty state copy changes
...
Bug: T288741
Change-Id: Ie8b8fc69d853bce21765926f36e2d1f730abbb5e
2021-08-26 12:03:50 -05:00
Translation updater bot
c960f41652
Localisation updates from https://translatewiki.net .
...
Change-Id: Ie0a9733577deffa4b0ee703bee5f955e1c6c1113
2021-08-24 12:38:41 +02:00
Bartosz Dziewoński
75d63bb056
Remove repetition in "Discussion pages" preferences
...
Bug: T289187
Change-Id: Id6c90546e4b57754e13b55f7c61610b51de87966
2021-08-18 20:20:34 +02:00
Bartosz Dziewoński
ad04b24ffd
Create a hidden revision tag for talk page comments
...
Bug: T262107
Depends-On: I21159d03eebaf46ad94f4273ba698a59b8019185
Change-Id: Iceddfaf6a4bcc5e8b5c85c8cd5638bf14aa7db03
2021-08-16 15:42:51 +00:00
jenkins-bot
2fa030aafc
Merge "Apply an empty-state to pages with the new topic tool enabled"
2021-08-05 16:52:49 +00:00
David Lynch
91af0594b5
Apply an empty-state to pages with the new topic tool enabled
...
This includes the dtrepliedto URL functionality from
I3f81e4d77faed367606e47678b8896051982359d.
Bug: T274831
Bug: T274832
Bug: T277329
Change-Id: I035d04f30c8312b0cb42902d3bf940df1482ffb3
2021-08-04 18:46:28 -05:00
David Lynch
b492d3d635
Update preferences language for source mode toolbar
...
Also, fix some copy-paste errors in the topic subscription qqq text.
Bug: T287315
Change-Id: I153467e6c02fb938825692204a02a6c327c941cb
2021-08-04 12:24:23 -05:00
Translation updater bot
cf1af27f32
Localisation updates from https://translatewiki.net .
...
Change-Id: I5c867270835bb40ff825f508d0e16c8d6eea8e93
2021-06-02 14:35:05 +02:00
Ed Sanders
5a166cfab5
Notification unsubcribe button
...
Bug: T279150
Change-Id: Ib0bfe3c0dced2108bddbc837a7ddd7bea814e129
2021-06-01 23:29:53 +02:00
Ed Sanders
6a24ceaeca
Subscribe/unsubscribe with plain text links
...
Bug: T279149
Bug: T279151
Change-Id: Ie7d46ea2e8d458fcdad4f91bb89ba038969f6b62
2021-06-01 20:37:47 +02:00
Ed Sanders
2b3345af11
Change feedback link for new topic tool
...
Bug: T279400
Change-Id: I5d72552f45a63199c0fbb516dc94aef19945c95e
2021-05-26 11:27:01 +00:00
Ed Sanders
eae0c1e6e1
Implement hidden tag for source mode with toolbar
...
Bug: T279157
Change-Id: I0244530580c7243e4db33848d36c336d8e5e8a08
2021-04-22 17:44:00 +00:00
Translation updater bot
ca223a2aa5
Localisation updates from https://translatewiki.net .
...
Change-Id: I4bad098bf9e49aabe8b3a977eeb1d2c23d09b062
2021-04-22 09:31:13 +02:00
Ed Sanders
0a39c11914
Echo wiring for topic subscriptions
...
Depends-On: I60818d57552946857077dee93b0adb036621b791
Change-Id: I7e0996843cdd70141e19d5c7ce66122204efa1b7
2021-04-06 23:28:28 +02:00
Ed Sanders
eb7e682d2f
Topic subscription front end
...
Bug: T276996
Change-Id: Ifb62c04c2a0ea8399749b22021d6a1c5a079bf94
2021-04-06 23:28:28 +02:00
Ed Sanders
4c27187500
Make the source mode toolbar a user preference feature
...
Bug: T275950
Change-Id: I099af342f378215c68092d165dd88de1807d29d2
2021-03-31 22:40:53 +02:00
Translation updater bot
c8748b218b
Localisation updates from https://translatewiki.net .
...
Change-Id: Ibcfbe8188a3ae05978f0f791d0829fe602633f6c
2021-03-22 08:36:25 +01:00
Ed Sanders
6c023da581
Sort message keys (and enforce sorting)
...
Change-Id: I72236c23323dc3292bf8a060c4270685c6decb9a
2021-02-23 16:33:11 +00:00
Translation updater bot
fe6d1d0485
Localisation updates from https://translatewiki.net .
...
Change-Id: I30b78a0b4076357253fd3bbc9d8a3a8e7803e2cf
2021-02-08 08:40:25 +01:00
Translation updater bot
6124c1acf7
Localisation updates from https://translatewiki.net .
...
Change-Id: Ifb50676b19de745a0730915849d422c00a1ea245
2021-02-03 08:39:04 +01:00
Bartosz Dziewoński
75beba2c15
Update localisation messages and their documentation for new discussion tool
...
Bug: T264220
Change-Id: I92f346f91cbd9bb7212d4c3389624e18fcb66255
2021-02-02 12:07:23 +00:00
Translation updater bot
9e8feded69
Localisation updates from https://translatewiki.net .
...
Change-Id: I8fbd2fea9809f2c0dd74ea6946730832bbde1446
2021-01-28 08:35:41 +01:00
Bartosz Dziewoński
460283baa5
Add a link to the project page to the "New topic" change tag
...
Bug: T272768
Change-Id: Ie363b9cb7137c6e8fe2ce8fc7d162e12e21b0a62
2021-01-25 17:09:46 +01:00
Bartosz Dziewoński
37b574f165
Separate dialog for abandoning a new topic
...
Bug: T269190
Change-Id: Ie4f486b0641edea369702631556d8ea31f991370
2021-01-19 21:40:21 +01:00
Translation updater bot
4269d65868
Localisation updates from https://translatewiki.net .
...
Change-Id: I9a480a90eac4d8e9ea9583feadf3423d052b094b
2021-01-13 08:36:15 +01:00
Bartosz Dziewoński
1c8ca53c92
Catch when no changes are actually saved when posting a comment
...
Bug: T268069
Change-Id: Ib9c136d846668335884a242322d5b0d4e038c6b1
2021-01-08 22:39:18 +00:00
Translation updater bot
2d50037da3
Localisation updates from https://translatewiki.net .
...
Change-Id: I10cd25b4c15a9ac21566e6b1abe432003681ee35
2021-01-07 08:31:34 +01:00
jenkins-bot
6ee665f348
Merge "Messages for new topic tool"
2021-01-06 13:14:08 +00:00
Ed Sanders
63580d3fe8
Messages for new topic tool
...
Change-Id: I29066e3c4faa6980ece3fc583174efe2aa1ad2c4
2021-01-06 13:07:03 +00:00
Translation updater bot
9c3f1d16c6
Localisation updates from https://translatewiki.net .
...
Change-Id: I18304408f6724d4f7b502861231f0db1bea3d922
2020-12-28 10:38:09 +01:00
Bartosz Dziewoński
7c01e20e47
Add postEdit notification
...
Per T267595#6656121
Bug: T268994
Change-Id: I2c47fc36ff6515b1f5f5e6bfd11f41eec9c1cd86
2020-12-01 21:43:39 +00:00
Bartosz Dziewoński
bc2e4ed170
Make the "Advanced" menu preference hidden
...
Follow-up to 2f28cfdf56
.
Bug: T261539
Change-Id: I8837885064b669e56dfaef9d1315926e7875d0b0
2020-10-29 15:43:34 +00:00
Bartosz Dziewoński
2f28cfdf56
Add preference to expand the "Advanced" menu when replying
...
* Add the preference
* Only display it when the reply tool is enabled
* Use it when opening the reply tool
* Save it when the menu is toggled from the reply tool interface
Bug: T261539
Change-Id: Icb8fa6b3f1e9a3644669f21b08f34ea8c175f2f9
2020-10-20 07:09:40 +02:00
jenkins-bot
97e8935ce6
Merge "Create preference for turning off reply tool once out of beta"
2020-09-12 19:18:26 +00:00
Ed Sanders
38b5a9c0fe
Create preference for turning off reply tool once out of beta
...
Bug: T259943
Depends-On: I75d38560a649794effbfc07cab1de0cc2e18f57b
Change-Id: Iec472bddd92e821d924a18db1734e8da6188b3dd
2020-09-11 22:16:57 +00:00
Ed Sanders
c439b3c356
Add "Advanced" & "Comment summary" messages for upcoming feature
...
Will be used in Ibfd1cf77.
Change-Id: Iff03f40c2cf5ad991db7e303343129e54326661e
2020-09-10 19:30:59 +01:00
Translation updater bot
fe8b9ec946
Localisation updates from https://translatewiki.net .
...
Change-Id: Icd04de603290ba820db353763e3fddf7d9d4c299
2020-09-08 10:24:02 +02:00
Bartosz Dziewoński
ff05e0c0b5
Improve error message for edit conflict
...
Bug: T261788
Change-Id: I079517ad6e258dd23b9048f4133f18cbb087acd9
2020-09-01 22:33:25 +02:00
Ed Sanders
3ad904e143
Improve documentation of source/visual tabs/tags
...
This has lead to confusion where 'visual' as been translated
as 'VisualEditor', and 'source' has been translated as 'wikitext'
(although in the latter case that may be the least confusing
translation possible for some languages).
Change-Id: Ifa7897dfb9bafd8fe240fd84afc92ba88b978944
2020-08-27 19:53:10 +01:00
jenkins-bot
b31c9ae7fb
Merge "Allow the mention prefix to be configured via a message"
2020-08-16 19:17:13 +00:00
Translation updater bot
b591c41c37
Localisation updates from https://translatewiki.net .
...
Change-Id: I86775068195c564452ad67dac669c25fbd3d0a0d
2020-08-14 08:37:42 +02:00
Ed Sanders
cc8b43b678
Allow the mention prefix to be configured via a message
...
Bug: T250332
Change-Id: I83c59fc665bbfe1027149bcb1cbce3f69d90c7ff
2020-08-12 18:45:25 +01:00
Translation updater bot
0adf9f3366
Localisation updates from https://translatewiki.net .
...
Change-Id: Idbed79c5c26f642a58b93408445376ba4aedf433
2020-08-12 08:19:12 +02:00
Ed Sanders
d43d66a5a4
Username suggestion header
...
Bug: T252084
Depends-On: Ie57dbe76725cc7d4c9a1c959623349ad707d0b88
Change-Id: I5e8b7582199d6b5674bdf8e9328c881a8c7c7673
2020-08-10 17:34:04 +00:00
Translation updater bot
f713d868b1
Localisation updates from https://translatewiki.net .
...
Change-Id: Ice050277e1fd95def7a452113e7a8d7b1cb67c63
2020-07-24 08:26:36 +02:00
Translation updater bot
8a85b7f598
Localisation updates from https://translatewiki.net .
...
Change-Id: I6ba51157040e34350f247f9ee8153a3afe978ef0
2020-07-23 08:27:45 +02:00
jenkins-bot
7eff952cb2
Merge "Signature handling in visual mode"
2020-07-22 01:42:47 +00:00
jenkins-bot
3db53080e8
Merge "Don't allow switching when unsupported content used"
2020-07-21 23:14:08 +00:00
Ed Sanders
854c8e4b28
Customise abandon edit dialog copy
...
Bug: T257069
Change-Id: I2770b53f826b5af689051cc681a75f9608e85de9
2020-07-17 23:04:44 +01:00
Bartosz Dziewoński
ee69365b82
Signature handling in visual mode
...
Load 'ext.visualEditor.mwsignature' (which implements VE's existing
handling for signatures), then subclass and override a bunch of things
in order to:
* Replace the context menu with a note that you don't need to type the
signature when commenting using the reply widget
* Override the sequence/command to insert signature so that it selects
it afterwards and thus displays the context menu
* Treat signatures as signature nodes when switching from wikitext,
instead of the normal pre-save transform turning them into regular
links and text
Bug: T255738
Change-Id: Icb542451c2307ab51e56bd627804096c7b5552c8
2020-07-16 01:32:19 +02:00
Ed Sanders
58aa412fa3
Don't allow switching when unsupported content used
...
Bug: T256150
Change-Id: I9b57996f069a1c0c05ef396cfe0ed81495a1d9ec
2020-07-09 13:05:09 +01:00
Translation updater bot
e9ca361ee4
Localisation updates from https://translatewiki.net .
...
Change-Id: I4e00b4454ecaa5d9835310f156d0a55370c30689
2020-06-29 16:25:51 +02:00
jenkins-bot
c678fffd49
Merge "Add user mention tool"
2020-06-15 19:46:19 +00:00
Ed Sanders
38d85268f0
Add user mention tool
...
Uses userAvatar for now while we wait on userAdd to be upstreamed.
Bug: T254366
Change-Id: Ifa512c518efa9740a138d3d42fc607f2840b4040
2020-06-11 20:53:49 +01:00
Ed Sanders
06eab3d961
Add square brackets around reply link and use lower case (when possible)
...
Bug: T249578
Change-Id: I5846106b10dc82231250d04a1f9ff025cfc1ca30
2020-06-09 19:55:14 +01:00
Ed Sanders
dada23e0f4
Make signature prefix customisable
...
Bug: T249861
Change-Id: I506a0c1b803275f5505fdf8ee29cc535814d7742
2020-06-01 18:55:04 +02:00
Ed Sanders
607440498e
Spell check pass
...
Change-Id: Ia20da358297126bd52a968bd77c960f81fe82b8f
2020-05-18 21:24:14 +00:00
Ed Sanders
fdae56ea82
Add messages for source/visual tabs
...
Separated from commit that uses them so they can start
to be translated.
Change-Id: Ifa30e231bd8aa8d9d387bb92e267f9a305615e62
2020-05-06 17:31:35 +01:00
Ed Sanders
011c13c930
Link the "Reply" tag to mediawiki.org
...
Bug: T250520
Change-Id: I0162c922eb22607e51b38e2ecebbe8738fd7c541
2020-05-02 12:50:00 +01:00
jenkins-bot
bb096d8f50
Merge "Revise error messages when replying to comments affected by templates"
2020-04-28 22:35:47 +00:00
Translation updater bot
0c098b1fab
Localisation updates from https://translatewiki.net .
...
Change-Id: If29a12637e8ef8d920e080505aa5ff5109a43c24
2020-04-27 09:02:36 +02:00
Bartosz Dziewoński
b1376413f0
Revise error messages when replying to comments affected by templates
...
Bug: T248607
Change-Id: Iea49d16bb0e5c71b36a79248f3f91f7987e65702
2020-04-26 19:50:32 +02:00
Bartosz Dziewoński
7ef3bffb1e
Show error on pages with fostered content to avoid page corruption in Parsoid
...
When the user clicks a "Reply" link on a page that is affected by the
'fostered' lint error (indicating fostered content in the HTML
representation), display an error and refuse to edit it, as Parsoid's
transformations will damage the page content.
The error message includes a link to documentation about lint errors,
and a link to the editor that will highlight the error location.
Depends-On: I723ec766d1244d117f8d624440026fe5af0d3403
Bug: T246481
Change-Id: Ic60cb58f98d10dc9b113469e5d3bbfb2d2b0564f
2020-04-21 17:40:39 +00:00
Ed Sanders
ba89657994
Add a share feedback link
...
Bug: T249016
Change-Id: I64abeebeea332a7a4a37fd4bfd6d5f9a5defc8b5
2020-04-14 23:04:18 +00:00
Translation updater bot
fa279f7507
Localisation updates from https://translatewiki.net .
...
Change-Id: I34c1046e79e104c957a0ab44d151e0f3b75c546d
2020-04-07 08:39:27 +02:00
Bartosz Dziewoński
807afd1ec0
Save the reply directly to the transcluded page
...
* When we discover the comment comes from a transcluded page, follow
the transclusion to find the source page. We follow transclusions
recursively, up to an arbitrary limit of 10.
* In the reply widget, display the title of the page where we will
save the reply, to avoid users confused why their edit won't show up
in the history. In the wikitext workflow this is done by redirecting
the user to the edited page at the end, but it seems less surprising
to stay on the current page.
* After saving the reply, we must purge the current page, otherwise
the new content will not be immediately visible on it.
Bug: T247535
Change-Id: I1c6631aa65a2fce6c1c2f0dd4a8c7aa6389caf94
2020-03-24 22:29:42 +00:00
Translation updater bot
820fe11584
Localisation updates from https://translatewiki.net .
...
Change-Id: I1ee41cfe541782b5736f05e1475b692d5d4958b8
2020-03-13 08:54:12 +01:00
Bartosz Dziewoński
e3e4ef9de4
parser: Detect comments transcluded from another page
...
When trying to reply to a comment that is inside a transclusion,
detect if it's transcluded from a subpage or simply wrapped in a
template, and show appropriate error messages.
References:
* VisualEditor ve.dm.Converter#getAboutGroup()
* VisualEditor ve.dm.ModelRegistry#matchElement()
* Parsoid Linter#findEnclosingTemplateName()
Bug: T245694
Change-Id: If3dd1ebbf1d02ee4379c200019bfc3a8ec02325b
2020-03-09 20:28:56 +01:00
Translation updater bot
6722975763
Localisation updates from https://translatewiki.net .
...
Change-Id: If96e77582475e45e066f48459daea05d7a56a445
2020-03-05 08:38:04 +01:00
Ed Sanders
7cb82b6862
Reply-to placeholder
...
Sets the placeholder text to "Reply to <user>".
Bug: T245227
Depends-On: I7f3a58b7093d00aace9f9c6a95a121ba4e901ad8
Change-Id: Ie51f1848c17bb892e7f64adf6f7f19fc38e56202
2020-02-29 17:29:07 +00:00
Translation updater bot
e7f72cc35d
Localisation updates from https://translatewiki.net .
...
Change-Id: I84432367314fb0bea5ec09ab80d841342dd20432
2020-02-25 09:36:31 +01:00
David Lynch
2085c76433
Adjust change tag display
...
* Hide the top-level discussiontools tag
* Change the wording of others to be more compact and consistent with the tense requested
Bug: T242184
Change-Id: Id7ba7fd7d0a387a3ca198fd546edf65fb663a9f8
2020-02-24 19:27:27 +00:00
jenkins-bot
4d6bdcafb1
Merge "Try to resolve edit conflicts"
2020-02-24 16:23:20 +00:00