lemmy.git
3 years agoRemove categories (fixes #1429)
Felix Ableitner [Thu, 25 Feb 2021 12:16:58 +0000 (13:16 +0100)]
Remove categories (fixes #1429)

3 years agoMerge pull request 'Better type safety for activity parsing' (#175) from apub-type...
dessalines [Wed, 24 Feb 2021 22:20:15 +0000 (22:20 +0000)]
Merge pull request 'Better type safety for activity parsing' (#175) from apub-type-safety into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/175

3 years agoBetter type safety for activity parsing
Felix Ableitner [Wed, 24 Feb 2021 19:37:27 +0000 (20:37 +0100)]
Better type safety for activity parsing

3 years agoMerge pull request 'Dont include community in comment `to` field (fixes #1446)' ...
dessalines [Wed, 24 Feb 2021 01:03:07 +0000 (01:03 +0000)]
Merge pull request 'Dont include community in comment `to` field (fixes #1446)' (#174) from no-community-in-comment-to into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/174

3 years agoFix lemmy_dev ansible playbook
Felix Ableitner [Tue, 23 Feb 2021 18:35:09 +0000 (19:35 +0100)]
Fix lemmy_dev ansible playbook

3 years agoDont include community in comment `to` field (fixes #1446)
Felix Ableitner [Tue, 23 Feb 2021 18:00:47 +0000 (19:00 +0100)]
Dont include community in comment `to` field (fixes #1446)

3 years agoMerge pull request 'Order outbox by published, not id' (#171) from outbox-order-publi...
dessalines [Mon, 22 Feb 2021 20:37:06 +0000 (20:37 +0000)]
Merge pull request 'Order outbox by published, not id' (#171) from outbox-order-published into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/171

3 years agoMerge pull request 'Use `name` field for post titles instead of `summary` (ref #1220...
dessalines [Mon, 22 Feb 2021 20:36:22 +0000 (20:36 +0000)]
Merge pull request 'Use `name` field for post titles instead of `summary` (ref #1220)' (#173) from apub-post-name into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/173

3 years agoMerge pull request 'Fix clippy error upper_case_acronyms' (#172) from fix-clippy...
dessalines [Mon, 22 Feb 2021 20:34:22 +0000 (20:34 +0000)]
Merge pull request 'Fix clippy error upper_case_acronyms' (#172) from fix-clippy into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/172

3 years agoUse `name` field for post titles instead of `summary` (ref #1220)
Felix Ableitner [Mon, 22 Feb 2021 18:34:41 +0000 (19:34 +0100)]
Use `name` field for post titles instead of `summary` (ref #1220)

3 years agoFix clippy error upper_case_acronyms
Felix Ableitner [Mon, 22 Feb 2021 18:04:32 +0000 (19:04 +0100)]
Fix clippy error upper_case_acronyms

3 years agoUpdating release version.
Dessalines [Fri, 19 Feb 2021 18:11:16 +0000 (13:11 -0500)]
Updating release version.

3 years agoVersion 0.9.9
Dessalines [Fri, 19 Feb 2021 18:10:04 +0000 (13:10 -0500)]
Version 0.9.9

3 years agoMerge pull request #1442 from LemmyNet/fix_deploy_version_1
Nutomic [Fri, 19 Feb 2021 18:09:27 +0000 (18:09 +0000)]
Merge pull request #1442 from LemmyNet/fix_deploy_version_1

Fixing deploy version.

3 years agoFixing deploy version.
Dessalines [Fri, 19 Feb 2021 18:05:42 +0000 (13:05 -0500)]
Fixing deploy version.

3 years agoAdding 0.9.8 release notes.
Dessalines [Fri, 19 Feb 2021 17:41:51 +0000 (12:41 -0500)]
Adding 0.9.8 release notes.

3 years agoVersion 0.9.8
Dessalines [Fri, 19 Feb 2021 16:38:24 +0000 (11:38 -0500)]
Version 0.9.8

3 years agoOrder outbox by published, not id
Felix Ableitner [Fri, 19 Feb 2021 14:59:06 +0000 (15:59 +0100)]
Order outbox by published, not id

3 years agoMerge remote-tracking branch 'yerba/main'
Dessalines [Thu, 18 Feb 2021 21:19:39 +0000 (16:19 -0500)]
Merge remote-tracking branch 'yerba/main'

3 years agoMerge pull request 'Specify order for activities query (fixes #1436)' (#169) from...
dessalines [Thu, 18 Feb 2021 21:18:26 +0000 (21:18 +0000)]
Merge pull request 'Specify order for activities query (fixes #1436)' (#169) from outbox-order into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/169

3 years agoFix aggregates time columns 2 (#1427)
Dessalines [Thu, 18 Feb 2021 15:53:04 +0000 (10:53 -0500)]
Fix aggregates time columns 2 (#1427)

* Adding a new comment sort. Fixes #1294

* Fixing a migration comment.

* Adding a comment for newest_comment_time_necro

* Make sure federated items set correct aggregates fields in trigger.

- Fixes #1402

3 years agoAdding a new comment sort for posts. Fixes #1294 (#1425)
Dessalines [Thu, 18 Feb 2021 15:38:25 +0000 (10:38 -0500)]
Adding a new comment sort for posts. Fixes #1294 (#1425)

* Adding a new comment sort. Fixes #1294

* Fixing a migration comment.

* Adding a comment for newest_comment_time_necro

3 years agoFix new compiler warning
Felix Ableitner [Thu, 18 Feb 2021 15:16:18 +0000 (16:16 +0100)]
Fix new compiler warning

3 years agoSpecify order for activities query (fixes #1436)
Felix Ableitner [Thu, 18 Feb 2021 15:15:52 +0000 (16:15 +0100)]
Specify order for activities query (fixes #1436)

3 years agoMerge pull request #1435 from LemmyNet/fix_lemmy_prod_open_port
Nutomic [Wed, 17 Feb 2021 16:42:32 +0000 (16:42 +0000)]
Merge pull request #1435 from LemmyNet/fix_lemmy_prod_open_port

Closing open lemmy-ui prod port. Fixes #1430

3 years agoClosing open lemmy-ui prod port. Fixes #1430
Dessalines [Wed, 17 Feb 2021 16:26:03 +0000 (11:26 -0500)]
Closing open lemmy-ui prod port. Fixes #1430

3 years agoMerge remote-tracking branch 'origin/main'
Dessalines [Thu, 11 Feb 2021 15:31:10 +0000 (10:31 -0500)]
Merge remote-tracking branch 'origin/main'

3 years agoMerge pull request 'Hide followed communities, except for own user (fixes #1303)...
dessalines [Thu, 11 Feb 2021 15:31:04 +0000 (15:31 +0000)]
Merge pull request 'Hide followed communities, except for own user (fixes #1303)' (#168) from hide-followed into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/168

3 years agoHide followed communities, except for own user (fixes #1303)
Felix Ableitner [Thu, 11 Feb 2021 13:53:17 +0000 (14:53 +0100)]
Hide followed communities, except for own user (fixes #1303)

3 years agoMerge pull request #1426 from LemmyNet/rss_link_post
Nutomic [Thu, 11 Feb 2021 13:06:29 +0000 (14:06 +0100)]
Merge pull request #1426 from LemmyNet/rss_link_post

Change RSS feeds to use lemmy URL for the rss link. Fixes #1378

3 years agoChange RSS feeds to use lemmy URL for the rss link. Fixes #1378
Dessalines [Wed, 10 Feb 2021 20:43:03 +0000 (15:43 -0500)]
Change RSS feeds to use lemmy URL for the rss link. Fixes #1378

3 years agoMerge remote-tracking branch 'origin/main'
Dessalines [Wed, 10 Feb 2021 20:13:22 +0000 (15:13 -0500)]
Merge remote-tracking branch 'origin/main'

3 years agoMerge pull request 'Explicitly mark posts and comments as public (ref #1220)' (#167...
dessalines [Wed, 10 Feb 2021 19:45:36 +0000 (19:45 +0000)]
Merge pull request 'Explicitly mark posts and comments as public (ref #1220)' (#167) from comments-posts-public into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/167

3 years agoMerge pull request #1422 from LemmyNet/display_name_limit
Nutomic [Wed, 10 Feb 2021 16:13:26 +0000 (16:13 +0000)]
Merge pull request #1422 from LemmyNet/display_name_limit

Display name limit

3 years agoFixing reason lengths to char counts.
Dessalines [Wed, 10 Feb 2021 15:36:22 +0000 (10:36 -0500)]
Fixing reason lengths to char counts.

3 years agoFixing display name limit. Fixes #1421
Dessalines [Wed, 10 Feb 2021 15:27:48 +0000 (10:27 -0500)]
Fixing display name limit. Fixes #1421

3 years agoExplicitly mark posts and comments as public (ref #1220)
Felix Ableitner [Wed, 10 Feb 2021 13:01:02 +0000 (14:01 +0100)]
Explicitly mark posts and comments as public (ref #1220)

3 years agoMerge pull request 'Move routes into separate crate to speed up compilation' (#166...
dessalines [Tue, 9 Feb 2021 18:44:45 +0000 (18:44 +0000)]
Merge pull request 'Move routes into separate crate to speed up compilation' (#166) from move-routes into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/166

3 years agoMove routes into separate crate to speed up compilation
Felix Ableitner [Tue, 9 Feb 2021 18:26:06 +0000 (19:26 +0100)]
Move routes into separate crate to speed up compilation

3 years agoAdding v0.9.7 release notes.
Dessalines [Mon, 8 Feb 2021 20:24:51 +0000 (15:24 -0500)]
Adding v0.9.7 release notes.

3 years agoVersion 0.9.7
Dessalines [Mon, 8 Feb 2021 20:17:56 +0000 (15:17 -0500)]
Version 0.9.7

3 years agoAdding 0.9.6 release notes.
Dessalines [Sat, 6 Feb 2021 16:50:31 +0000 (11:50 -0500)]
Adding 0.9.6 release notes.

3 years agoFixing build / drone badge.
Dessalines [Sat, 6 Feb 2021 04:19:23 +0000 (23:19 -0500)]
Fixing build / drone badge.

3 years agoFixing image links. #1355
Dessalines [Sat, 6 Feb 2021 04:15:02 +0000 (23:15 -0500)]
Fixing image links. #1355

3 years agoVersion 0.9.6
Dessalines [Fri, 5 Feb 2021 18:01:29 +0000 (13:01 -0500)]
Version 0.9.6

3 years agoMerge pull request #1415 from LemmyNet/fed_inbox_url_fix
Nutomic [Fri, 5 Feb 2021 17:59:56 +0000 (17:59 +0000)]
Merge pull request #1415 from LemmyNet/fed_inbox_url_fix

Fixing inbox url code migration. Fixes #1414

3 years agoMerge pull request 'Include object id when logging apub errors' (#165) from log-ids...
dessalines [Fri, 5 Feb 2021 17:52:51 +0000 (17:52 +0000)]
Merge pull request 'Include object id when logging apub errors' (#165) from log-ids into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/165

3 years agoMerge remote-tracking branch 'yerba/main'
Dessalines [Fri, 5 Feb 2021 17:50:31 +0000 (12:50 -0500)]
Merge remote-tracking branch 'yerba/main'

3 years agoMerge pull request 'Make apub extension fields optional (ref #1220)' (#163) from...
dessalines [Fri, 5 Feb 2021 17:50:42 +0000 (17:50 +0000)]
Merge pull request 'Make apub extension fields optional (ref #1220)' (#163) from optional-apub-extensions into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/163

3 years agoFixing inbox url code migration. Fixes #1414
Dessalines [Fri, 5 Feb 2021 17:06:32 +0000 (12:06 -0500)]
Fixing inbox url code migration. Fixes #1414

3 years agoMerge pull request #1412 from LemmyNet/fix_search_communities_subscribed
Nutomic [Fri, 5 Feb 2021 16:33:06 +0000 (16:33 +0000)]
Merge pull request #1412 from LemmyNet/fix_search_communities_subscribed

Fixing community search not using auth. Fixes #1411

3 years agoInclude object id when logging apub errors
Felix Ableitner [Fri, 5 Feb 2021 16:15:29 +0000 (17:15 +0100)]
Include object id when logging apub errors

3 years agoFixing community search not using auth. Fixes #1411
Dessalines [Fri, 5 Feb 2021 15:36:28 +0000 (10:36 -0500)]
Fixing community search not using auth. Fixes #1411

3 years agoMake apub extension fields optional (ref #1220)
Felix Ableitner [Fri, 5 Feb 2021 13:23:57 +0000 (14:23 +0100)]
Make apub extension fields optional (ref #1220)

3 years agoMoving docs to join.lemmy.ml . Fixes #1396 (#1410)
Dessalines [Fri, 5 Feb 2021 12:30:49 +0000 (07:30 -0500)]
Moving docs to join.lemmy.ml . Fixes #1396 (#1410)

* Moving docs to join.lemmy.ml . Fixes #1396

* Removing submodule fetch from drone.

3 years agoVersion 0.9.5
Dessalines [Fri, 5 Feb 2021 03:48:21 +0000 (22:48 -0500)]
Version 0.9.5

3 years agoRemoving old lemmy schema.
Dessalines [Thu, 4 Feb 2021 16:35:20 +0000 (11:35 -0500)]
Removing old lemmy schema.

3 years agoStore activitypub endpoints in database (#162)
nutomic [Thu, 4 Feb 2021 16:34:58 +0000 (16:34 +0000)]
Store activitypub endpoints in database (#162)

Address review comments

Store Activitypub urls in database (fixes #808)

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/162
Co-Authored-By: nutomic <nutomic@noreply.yerbamate.ml>
Co-Committed-By: nutomic <nutomic@noreply.yerbamate.ml>
3 years agoSome updates to 0.9.4 release.
Dessalines [Tue, 2 Feb 2021 21:01:08 +0000 (16:01 -0500)]
Some updates to 0.9.4 release.

3 years agoSome updates to 0.9.4 release.
Dessalines [Tue, 2 Feb 2021 20:57:45 +0000 (15:57 -0500)]
Some updates to 0.9.4 release.

3 years agoAdding pre-release notes.
Dessalines [Tue, 2 Feb 2021 20:45:02 +0000 (15:45 -0500)]
Adding pre-release notes.

3 years agoVersion 0.9.4
Dessalines [Tue, 2 Feb 2021 20:29:38 +0000 (15:29 -0500)]
Version 0.9.4

3 years agoMerge branch 'main' of https://github.com/lemmynet/lemmy
Dessalines [Tue, 2 Feb 2021 16:13:31 +0000 (11:13 -0500)]
Merge branch 'main' of https://github.com/lemmynet/lemmy

3 years agoMerge pull request #1406 from LemmyNet/upgrade_deps
Nutomic [Tue, 2 Feb 2021 15:17:11 +0000 (15:17 +0000)]
Merge pull request #1406 from LemmyNet/upgrade_deps

Trying to upgrade lemmys deps.

3 years agoAdding awesome-humane-tech to readme. #1394
Dessalines [Tue, 2 Feb 2021 14:35:56 +0000 (09:35 -0500)]
Adding awesome-humane-tech to readme. #1394

3 years agoMoving back tokio and reqwest.
Dessalines [Tue, 2 Feb 2021 02:54:23 +0000 (21:54 -0500)]
Moving back tokio and reqwest.

3 years agoTrying to upgrade lemmys deps.
Dessalines [Mon, 1 Feb 2021 20:56:37 +0000 (15:56 -0500)]
Trying to upgrade lemmys deps.

3 years agoAdd allowed and blocked instances to the federated_instances response. (#1398)
Dessalines [Mon, 1 Feb 2021 18:11:37 +0000 (13:11 -0500)]
Add allowed and blocked instances to the federated_instances response. (#1398)

- Fixes #1315

3 years agoAdding forum sort for post_aggregates. Fixes #1312 (#1400)
Dessalines [Mon, 1 Feb 2021 16:53:44 +0000 (11:53 -0500)]
Adding forum sort for post_aggregates. Fixes #1312 (#1400)

* Adding forum sort for post_aggregates. Fixes #1312

* Changing sort name from forum to MostComments.

3 years agoMerge pull request #1401 from LemmyNet/non_null_post_view_vote
Dessalines [Mon, 1 Feb 2021 15:43:34 +0000 (10:43 -0500)]
Merge pull request #1401 from LemmyNet/non_null_post_view_vote

Post and comment vote views now return 0 instead of null.

3 years agoMerge pull request #1399 from LemmyNet/dont_let_banned_users_follow
Nutomic [Mon, 1 Feb 2021 12:19:41 +0000 (12:19 +0000)]
Merge pull request #1399 from LemmyNet/dont_let_banned_users_follow

Make sure banned users cant subscribe, and the ban unsubs them. Fixes…

3 years agoMerge pull request #1397 from LemmyNet/parent_comment_check
Nutomic [Mon, 1 Feb 2021 12:13:18 +0000 (12:13 +0000)]
Merge pull request #1397 from LemmyNet/parent_comment_check

Add check for parent comment. Fixes #1390

3 years agoPost and comment vote views now return 0 instead of null.
Dessalines [Sun, 31 Jan 2021 15:29:21 +0000 (10:29 -0500)]
Post and comment vote views now return 0 instead of null.

- Fixes #1389

3 years agoMake sure banned users cant subscribe, and the ban unsubs them. Fixes #1324
Dessalines [Sun, 31 Jan 2021 04:55:14 +0000 (23:55 -0500)]
Make sure banned users cant subscribe, and the ban unsubs them. Fixes #1324

3 years agoAdd check for parent comment. Fixes #1390
Dessalines [Sun, 31 Jan 2021 04:10:16 +0000 (23:10 -0500)]
Add check for parent comment. Fixes #1390

3 years agoAdd readme link to translation instructions for documentation (#1392)
Nutomic [Sat, 30 Jan 2021 17:00:33 +0000 (17:00 +0000)]
Add readme link to translation instructions for documentation (#1392)

* Add readme link to translation instructions for documentation

* Fix contributing link in readme

3 years agorename lemmer to remmel (#1391)
Anton Kuzmin [Sat, 30 Jan 2021 16:51:38 +0000 (19:51 +0300)]
rename lemmer to remmel (#1391)

3 years agoVersion 0.9.3
Dessalines [Fri, 29 Jan 2021 19:25:20 +0000 (14:25 -0500)]
Version 0.9.3

3 years agoNodeinfo devs think halfyear is one word.
Dessalines [Fri, 29 Jan 2021 19:24:10 +0000 (14:24 -0500)]
Nodeinfo devs think halfyear is one word.

3 years agoVersion 0.9.2
Dessalines [Fri, 29 Jan 2021 18:49:43 +0000 (13:49 -0500)]
Version 0.9.2

3 years agoAdding camelCase to node-info users.
Dessalines [Fri, 29 Jan 2021 18:48:59 +0000 (13:48 -0500)]
Adding camelCase to node-info users.

3 years agoVersion 0.9.1
Dessalines [Fri, 29 Jan 2021 16:43:16 +0000 (11:43 -0500)]
Version 0.9.1

3 years agoAdding some recurring lemmy tasks. (#1386)
Dessalines [Fri, 29 Jan 2021 16:38:27 +0000 (11:38 -0500)]
Adding some recurring lemmy tasks. (#1386)

* Adding some recurring lemmy tasks.

- Add active users by day, week, month, and half year to site and
  community. Fixes #1195
- Periodically re-index the aggregates tables that use hot_rank.
  Fixes #1384
- Clear out old activities (> 6 months). Fixes #1133

* Some cleanup, recalculating actives every hour.

3 years agoMerge pull request 'Increase MAX_REQUEST_NUMBER for fetches to 25' (#161) from fetch...
dessalines [Fri, 29 Jan 2021 15:52:23 +0000 (15:52 +0000)]
Merge pull request 'Increase MAX_REQUEST_NUMBER for fetches to 25' (#161) from fetch-limit into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/161

3 years agoIncrease MAX_REQUEST_NUMBER for fetches to 25
Felix Ableitner [Fri, 29 Jan 2021 15:45:28 +0000 (16:45 +0100)]
Increase MAX_REQUEST_NUMBER for fetches to 25

3 years agoMerge remote-tracking branch 'yerba/outbox-activities'
Dessalines [Fri, 29 Jan 2021 14:17:14 +0000 (09:17 -0500)]
Merge remote-tracking branch 'yerba/outbox-activities'

3 years agoServe activities in community outbox (fixes #1216)
Felix Ableitner [Wed, 27 Jan 2021 14:02:28 +0000 (15:02 +0100)]
Serve activities in community outbox (fixes #1216)

3 years agoUse Url type for ap_id fields in database (fixes #1364) (#1371)
Nutomic [Wed, 27 Jan 2021 16:42:23 +0000 (16:42 +0000)]
Use Url type for ap_id fields in database (fixes #1364) (#1371)

3 years agoFixing some readme links. Fixes #1382
Dessalines [Tue, 26 Jan 2021 19:49:15 +0000 (14:49 -0500)]
Fixing some readme links. Fixes #1382

3 years agoUse Url type for ap_id fields in database (fixes #1364)
Felix Ableitner [Mon, 25 Jan 2021 13:33:34 +0000 (14:33 +0100)]
Use Url type for ap_id fields in database (fixes #1364)

3 years agoAdd listing type to list communities (#1380)
Dessalines [Tue, 26 Jan 2021 17:18:01 +0000 (12:18 -0500)]
Add listing type to list communities (#1380)

* Adding listing type to ListCommunities. Fixes #1379

* Upgrading lemmy-js-client.

3 years agoMerge pull request #1381 from LemmyNet/fix_mod_bans_and_adds
Nutomic [Tue, 26 Jan 2021 16:57:49 +0000 (16:57 +0000)]
Merge pull request #1381 from LemmyNet/fix_mod_bans_and_adds

Fixing modlog not showing bans and adds. Fixes #1376

3 years agoFixing modlog not showing bans and adds. Fixes #1376
Dessalines [Tue, 26 Jan 2021 16:45:36 +0000 (11:45 -0500)]
Fixing modlog not showing bans and adds. Fixes #1376

3 years agoUpdating releases.md
Dessalines [Mon, 25 Jan 2021 14:44:33 +0000 (09:44 -0500)]
Updating releases.md

3 years agoFixing release docs location.
Dessalines [Mon, 25 Jan 2021 05:10:27 +0000 (00:10 -0500)]
Fixing release docs location.

3 years agoVersion 0.9.0
Dessalines [Mon, 25 Jan 2021 03:43:52 +0000 (22:43 -0500)]
Version 0.9.0

3 years agoDocker manifest arm amd64 deploy (#1367)
Dessalines [Mon, 25 Jan 2021 03:44:35 +0000 (22:44 -0500)]
Docker manifest arm amd64 deploy (#1367)

* A first try at docker manifest. 1.

* Fixing api version location

* Version 0.9.0-rc.13

* Test docker.

* Test docker 2.

* Test docker 3.

* Test docker 4.

* Test docker 5.

* Test docker 6.

* Test docker 7.

* Test docker 8.

* Test docker 9.

* Test docker 10.

* Test docker 11.

* Test docker 12.

* Version 0.9.0-rc.14

* Test docker 13.

* Test docker 14.

* Version 0.9.0-rc.15

* Test docker 15.

* Version 0.9.0-rc.16

* Test docker 16.

* Version 0.9.0-rc.17

3 years agoAdding 0.9.0 Release notes.
Dessalines [Mon, 25 Jan 2021 03:40:39 +0000 (22:40 -0500)]
Adding 0.9.0 Release notes.

3 years agoUpdating docs locations.
Dessalines [Sat, 23 Jan 2021 19:56:41 +0000 (14:56 -0500)]
Updating docs locations.

3 years agoMerge branch 'uuttff8-main'
Dessalines [Fri, 22 Jan 2021 18:35:12 +0000 (13:35 -0500)]
Merge branch 'uuttff8-main'