]> Untitled Git - lemmy.git/log
lemmy.git
3 years agoFinishing up user aggregates.
Dessalines [Thu, 3 Dec 2020 15:18:17 +0000 (10:18 -0500)]
Finishing up user aggregates.

3 years agoMerge branch 'main' into move_views_to_diesel
Dessalines [Thu, 3 Dec 2020 14:34:45 +0000 (09:34 -0500)]
Merge branch 'main' into move_views_to_diesel

3 years agoVersion v0.8.10
Dessalines [Thu, 3 Dec 2020 14:28:58 +0000 (08:28 -0600)]
Version v0.8.10

3 years agoStarting to work on user aggs.
Dessalines [Thu, 3 Dec 2020 14:27:22 +0000 (08:27 -0600)]
Starting to work on user aggs.

3 years agoMerge pull request #1304 from LemmyNet/fix_community_local_filter
Nutomic [Thu, 3 Dec 2020 11:55:16 +0000 (11:55 +0000)]
Merge pull request #1304 from LemmyNet/fix_community_local_filter

Fixing community local filter. #1302

3 years agoAdding SiteAggregates.
Dessalines [Thu, 3 Dec 2020 03:39:31 +0000 (22:39 -0500)]
Adding SiteAggregates.

3 years agoFixing community local filter. #1302
Dessalines [Wed, 2 Dec 2020 21:04:13 +0000 (16:04 -0500)]
Fixing community local filter. #1302

3 years agoStarting on siteview.
Dessalines [Wed, 2 Dec 2020 19:32:47 +0000 (13:32 -0600)]
Starting on siteview.

3 years agoMerge pull request #1300 from Tafiti/patch-1
Nutomic [Wed, 2 Dec 2020 12:55:46 +0000 (12:55 +0000)]
Merge pull request #1300 from Tafiti/patch-1

Added council member

3 years agoAdded a council member.
Tafiti [Tue, 1 Dec 2020 23:22:17 +0000 (18:22 -0500)]
Added a council member.

3 years agotypo
Tafiti [Tue, 1 Dec 2020 23:18:47 +0000 (18:18 -0500)]
typo

3 years agoVersion v0.8.9
Dessalines [Tue, 1 Dec 2020 18:54:44 +0000 (12:54 -0600)]
Version v0.8.9

3 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Tue, 1 Dec 2020 18:29:51 +0000 (13:29 -0500)]
Merge remote-tracking branch 'yerba/main' into main

3 years agoAdd check to make sure that inbox doesnt receive local activities (ref #1283) (#147)
nutomic [Tue, 1 Dec 2020 18:30:15 +0000 (18:30 +0000)]
Add check to make sure that inbox doesnt receive local activities (ref #1283) (#147)

Fixed comparison

Add check to make sure that inbox doesnt receive local activities (ref #1283)

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/147

3 years agoFix post ranking docs in about guide. Fixes #1294 (#1295)
Dessalines [Tue, 1 Dec 2020 17:54:37 +0000 (12:54 -0500)]
Fix post ranking docs in about guide. Fixes #1294 (#1295)

* Fix post ranking docs in about guide. Fixes #1294

* Shortening lines to refer to not just posts.

* Fixing top line.

3 years agoMaking sure image uploads have jwt cookie. Fixes #1291 (#1299)
Dessalines [Tue, 1 Dec 2020 17:48:39 +0000 (12:48 -0500)]
Making sure image uploads have jwt cookie. Fixes #1291 (#1299)

3 years agoMerge branch 'patch-1' of https://github.com/Whayme/lemmy into Whayme-patch-1
Dessalines [Tue, 1 Dec 2020 17:32:27 +0000 (11:32 -0600)]
Merge branch 'patch-1' of https://github.com/Whayme/lemmy into Whayme-patch-1

3 years agoUpdate lemmy_council.md (#1290)
Porrumentzio [Tue, 1 Dec 2020 16:25:04 +0000 (17:25 +0100)]
Update lemmy_council.md (#1290)

Removed line saying that council members are administrators on official instances, as it is unclear that currently only https://lemmy.ml is a official instance.

3 years agoReplaced table
Scarlett [Mon, 30 Nov 2020 19:53:08 +0000 (13:53 -0600)]
Replaced table

3 years agoRevert "Short intro explanation, reformatted as a table"
Dessalines [Mon, 30 Nov 2020 19:24:09 +0000 (14:24 -0500)]
Revert "Short intro explanation, reformatted as a table"

This reverts commit 961fc9d0ce1683e79188d42594ad9a59f59b0426.

3 years agoVersion v0.8.8
Dessalines [Mon, 30 Nov 2020 18:56:05 +0000 (12:56 -0600)]
Version v0.8.8

3 years agoMerge pull request 'Add logging to find bug (ref #1283)' (#146) from debug-1283 into...
dessalines [Mon, 30 Nov 2020 18:49:11 +0000 (18:49 +0000)]
Merge pull request 'Add logging to find bug (ref #1283)' (#146) from debug-1283 into main

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

3 years agoRemove `dbg!` to avoid spamming logs
Felix Ableitner [Mon, 30 Nov 2020 17:28:31 +0000 (18:28 +0100)]
Remove `dbg!` to avoid spamming logs

3 years agoAdd logging to find bug (ref #1283)
Felix Ableitner [Mon, 30 Nov 2020 17:24:10 +0000 (18:24 +0100)]
Add logging to find bug (ref #1283)

Also simplify check_object_domain()

3 years agoMerge pull request #1285 from Whayme/patch-1
Dessalines [Sat, 28 Nov 2020 21:16:43 +0000 (16:16 -0500)]
Merge pull request #1285 from Whayme/patch-1

Short intro explanation, reformatted as a table

3 years agoShort intro explanation, reformatted as a table
Scarlett [Sat, 28 Nov 2020 06:29:56 +0000 (00:29 -0600)]
Short intro explanation, reformatted as a table

More explanation from someone who understands the benefits of the log scale would be helpful.

3 years agoBetter account deletion (fixes #730) (#143)
nutomic [Fri, 27 Nov 2020 21:00:18 +0000 (21:00 +0000)]
Better account deletion (fixes #730) (#143)

Also clear bio

Better account deletion (fixes #730)

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/143

3 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Fri, 27 Nov 2020 21:00:15 +0000 (16:00 -0500)]
Merge remote-tracking branch 'yerba/main' into main

3 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Fri, 27 Nov 2020 20:58:22 +0000 (15:58 -0500)]
Merge remote-tracking branch 'yerba/main' into main

3 years agoMerge pull request 'Set valid context for our extra fields (ref #1220)' (#142) from...
dessalines [Fri, 27 Nov 2020 20:28:52 +0000 (20:28 +0000)]
Merge pull request 'Set valid context for our extra fields (ref #1220)' (#142) from apub-context into main

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

3 years agoAdding a local RSS feed. Fixes #1279 (#1280)
Dessalines [Thu, 26 Nov 2020 17:26:31 +0000 (12:26 -0500)]
Adding a local RSS feed. Fixes #1279 (#1280)

* Adding a local RSS feed. Fixes #1279

* Shorten get_local_feed and get_all_feed functions

* Making the enum params the same.

Co-authored-by: Felix Ableitner <me@nutomic.com>
3 years agoChange references of dev.lemmy.ml to lemmy.ml (#1281)
Dessalines [Thu, 26 Nov 2020 16:47:01 +0000 (11:47 -0500)]
Change references of dev.lemmy.ml to lemmy.ml (#1281)

* Change references of dev.lemmy.ml to lemmy.ml

* Remove the dev.lemmy.ml refs in RELEASES.md

3 years agoMerge branch 'eiknat-feature/add-reporting-backend' into main
Felix Ableitner [Thu, 26 Nov 2020 12:31:25 +0000 (13:31 +0100)]
Merge branch 'eiknat-feature/add-reporting-backend' into main

3 years agoMinor cleanup on reports PR
Felix Ableitner [Thu, 26 Nov 2020 12:28:58 +0000 (13:28 +0100)]
Minor cleanup on reports PR

3 years agoMake changes on `content` field backwards compatible
Felix Ableitner [Wed, 25 Nov 2020 13:07:04 +0000 (14:07 +0100)]
Make changes on `content` field backwards compatible

3 years agoTrying out cargo chef and a travis docker image cache. (#1238)
Dessalines [Mon, 23 Nov 2020 15:59:06 +0000 (10:59 -0500)]
Trying out cargo chef and a travis docker image cache. (#1238)

* Trying out cargo chef and a travis docker image cache.

* trying to change internal target.

* Use latest cargo-chef with --target

* Remove caching for now.

* Adding back in chowns

* Adding back in cache.

* Remove travis caching.

* Switching dev dockerfile to match prod, using cargo-chef and alpine.

* Make travis happy

* Trying a chown rust.

* Caching cargo-chef first.

* Moving the chowns

* Removing many copy commands.

* Go back to rust 1.47.0 due to config-rs breaking.

* Adding the old volume mount version.

* Adding some script comments.

Co-authored-by: Luca Palmieri <lpalmieri@truelayer.com>
3 years agoPopulate `content` with HTML, and `source` with markdown (ref #1220)
Felix Ableitner [Tue, 24 Nov 2020 17:53:43 +0000 (18:53 +0100)]
Populate `content` with HTML, and `source` with markdown (ref #1220)

3 years agoRemove clap dependency
Felix Ableitner [Mon, 23 Nov 2020 17:48:20 +0000 (18:48 +0100)]
Remove clap dependency

3 years agoGenerate valid RSS feed (fixes #1274)
Felix Ableitner [Fri, 20 Nov 2020 14:11:47 +0000 (15:11 +0100)]
Generate valid RSS feed (fixes #1274)

3 years agoAdd TODO about populating user outbox
Felix Ableitner [Thu, 19 Nov 2020 12:50:43 +0000 (13:50 +0100)]
Add TODO about populating user outbox

3 years agoVersion v0.8.7
Dessalines [Wed, 18 Nov 2020 22:18:53 +0000 (16:18 -0600)]
Version v0.8.7

3 years agoVersion v0.8.6
Dessalines [Wed, 18 Nov 2020 19:12:24 +0000 (13:12 -0600)]
Version v0.8.6

3 years agoCreate empty outbox for user (ref #1220)
Felix Ableitner [Wed, 18 Nov 2020 16:04:35 +0000 (17:04 +0100)]
Create empty outbox for user (ref #1220)

3 years agoVersion v0.8.5
Dessalines [Tue, 17 Nov 2020 21:11:58 +0000 (15:11 -0600)]
Version v0.8.5

3 years agoFor community_name API parameters, only search locally (fixes #1271)
Felix Ableitner [Tue, 17 Nov 2020 17:05:25 +0000 (18:05 +0100)]
For community_name API parameters, only search locally (fixes #1271)

3 years agoDont handle activities twice in inbox
Felix Ableitner [Mon, 16 Nov 2020 20:41:47 +0000 (21:41 +0100)]
Dont handle activities twice in inbox

3 years agoReduce visibility of some structs and methods (replaces #1266)
Felix Ableitner [Mon, 16 Nov 2020 15:44:04 +0000 (16:44 +0100)]
Reduce visibility of some structs and methods (replaces #1266)

3 years agoVersion v0.8.4
Dessalines [Thu, 12 Nov 2020 17:54:31 +0000 (11:54 -0600)]
Version v0.8.4

3 years agoAdd user_inbox check that activities are really addressed to local users
Felix Ableitner [Wed, 11 Nov 2020 16:40:45 +0000 (17:40 +0100)]
Add user_inbox check that activities are really addressed to local users

3 years agoMerge pull request 'Populate `content` with HTML, and `source` with markdown (ref...
dessalines [Wed, 25 Nov 2020 19:54:52 +0000 (19:54 +0000)]
Merge pull request 'Populate `content` with HTML, and `source` with markdown (ref #1220)' (#141) from apub-media-type2 into main

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

3 years agoSet valid context for our extra fields (ref #1220)
Felix Ableitner [Wed, 25 Nov 2020 17:44:49 +0000 (18:44 +0100)]
Set valid context for our extra fields (ref #1220)

3 years agoMake changes on `content` field backwards compatible
Felix Ableitner [Wed, 25 Nov 2020 13:07:04 +0000 (14:07 +0100)]
Make changes on `content` field backwards compatible

3 years agoMerge branch 'main' into apub-media-type2
Felix Ableitner [Wed, 25 Nov 2020 12:15:29 +0000 (13:15 +0100)]
Merge branch 'main' into apub-media-type2

3 years agoPopulate `content` with HTML, and `source` with markdown (ref #1220)
Felix Ableitner [Tue, 24 Nov 2020 17:53:43 +0000 (18:53 +0100)]
Populate `content` with HTML, and `source` with markdown (ref #1220)

3 years agoMerge pull request 'Remove clap dependency' (#139) from remove-clap2 into main
dessalines [Mon, 23 Nov 2020 18:01:39 +0000 (18:01 +0000)]
Merge pull request 'Remove clap dependency' (#139) from remove-clap2 into main

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

3 years agoRemove clap dependency
Felix Ableitner [Mon, 23 Nov 2020 17:48:20 +0000 (18:48 +0100)]
Remove clap dependency

3 years agoTrying out cargo chef and a travis docker image cache. (#1238)
Dessalines [Mon, 23 Nov 2020 15:59:06 +0000 (10:59 -0500)]
Trying out cargo chef and a travis docker image cache. (#1238)

* Trying out cargo chef and a travis docker image cache.

* trying to change internal target.

* Use latest cargo-chef with --target

* Remove caching for now.

* Adding back in chowns

* Adding back in cache.

* Remove travis caching.

* Switching dev dockerfile to match prod, using cargo-chef and alpine.

* Make travis happy

* Trying a chown rust.

* Caching cargo-chef first.

* Moving the chowns

* Removing many copy commands.

* Go back to rust 1.47.0 due to config-rs breaking.

* Adding the old volume mount version.

* Adding some script comments.

Co-authored-by: Luca Palmieri <lpalmieri@truelayer.com>
3 years agoMerge pull request 'Generate valid RSS feed (fixes #1274)' (#136) from valid-rss...
dessalines [Fri, 20 Nov 2020 18:55:11 +0000 (18:55 +0000)]
Merge pull request 'Generate valid RSS feed (fixes #1274)' (#136) from valid-rss into main

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

3 years agoGenerate valid RSS feed (fixes #1274)
Felix Ableitner [Fri, 20 Nov 2020 14:11:47 +0000 (15:11 +0100)]
Generate valid RSS feed (fixes #1274)

3 years agoAdd TODO about populating user outbox
Felix Ableitner [Thu, 19 Nov 2020 12:50:43 +0000 (13:50 +0100)]
Add TODO about populating user outbox

3 years agoVersion v0.8.7
Dessalines [Wed, 18 Nov 2020 22:18:53 +0000 (16:18 -0600)]
Version v0.8.7

3 years agoVersion v0.8.6
Dessalines [Wed, 18 Nov 2020 19:12:24 +0000 (13:12 -0600)]
Version v0.8.6

3 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Wed, 18 Nov 2020 19:12:08 +0000 (13:12 -0600)]
Merge remote-tracking branch 'yerba/main' into main

3 years agoMerge pull request 'Create empty outbox for user (ref #1220)' (#135) from user-outbox...
dessalines [Wed, 18 Nov 2020 19:13:32 +0000 (19:13 +0000)]
Merge pull request 'Create empty outbox for user (ref #1220)' (#135) from user-outbox into main

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

3 years agoCreate empty outbox for user (ref #1220)
Felix Ableitner [Wed, 18 Nov 2020 16:04:35 +0000 (17:04 +0100)]
Create empty outbox for user (ref #1220)

3 years agoVersion v0.8.5
Dessalines [Tue, 17 Nov 2020 21:11:58 +0000 (15:11 -0600)]
Version v0.8.5

3 years agoMerge pull request 'For community_name API parameters, only search locally (fixes...
dessalines [Tue, 17 Nov 2020 21:07:00 +0000 (21:07 +0000)]
Merge pull request 'For community_name API parameters, only search locally (fixes #1271)' (#134) from community-name-local into main

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

3 years agoFor community_name API parameters, only search locally (fixes #1271)
Felix Ableitner [Tue, 17 Nov 2020 17:05:25 +0000 (18:05 +0100)]
For community_name API parameters, only search locally (fixes #1271)

3 years agoMerge pull request 'Dont handle activities twice in inbox' (#133) from inbox-deduplic...
dessalines [Tue, 17 Nov 2020 15:43:11 +0000 (15:43 +0000)]
Merge pull request 'Dont handle activities twice in inbox' (#133) from inbox-deduplicate-handling into main

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

3 years agoDont handle activities twice in inbox
Felix Ableitner [Mon, 16 Nov 2020 20:41:47 +0000 (21:41 +0100)]
Dont handle activities twice in inbox

4 years agoMerge pull request 'Reduce visibility of some structs and methods (replaces #1266...
dessalines [Mon, 16 Nov 2020 16:36:30 +0000 (16:36 +0000)]
Merge pull request 'Reduce visibility of some structs and methods (replaces #1266)' (#132) from reduce-visibility into main

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

4 years agoReduce visibility of some structs and methods (replaces #1266)
Felix Ableitner [Mon, 16 Nov 2020 15:44:04 +0000 (16:44 +0100)]
Reduce visibility of some structs and methods (replaces #1266)

4 years agoVersion v0.8.4
Dessalines [Thu, 12 Nov 2020 17:54:31 +0000 (11:54 -0600)]
Version v0.8.4

4 years agoMerge pull request 'Add user_inbox check that activities are really addressed to...
nutomic [Thu, 12 Nov 2020 12:50:00 +0000 (12:50 +0000)]
Merge pull request 'Add user_inbox check that activities are really addressed to local users' (#131) from user-inbox-check into main

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

4 years agoadd doc
eiknat [Wed, 11 Nov 2020 20:41:40 +0000 (15:41 -0500)]
add doc

4 years agoupdate/fix migration, add some doc
eiknat [Wed, 4 Nov 2020 02:15:11 +0000 (21:15 -0500)]
update/fix migration, add some doc

also run cargo fmt/clippy

4 years agoadd more details to the report views
eiknat [Tue, 3 Nov 2020 03:06:20 +0000 (22:06 -0500)]
add more details to the report views

4 years agoadd mod room websocket impl
eiknat [Tue, 27 Oct 2020 00:25:18 +0000 (20:25 -0400)]
add mod room websocket impl

4 years agoadd current context for reports
eiknat [Sun, 25 Oct 2020 03:24:50 +0000 (23:24 -0400)]
add current context for reports

4 years agoreports: split post/comment out again, add some other fixes
eiknat [Sun, 25 Oct 2020 02:59:13 +0000 (22:59 -0400)]
reports: split post/comment out again, add some other fixes

4 years agodb: fix a few comments i missed
eiknat [Wed, 21 Oct 2020 01:37:37 +0000 (21:37 -0400)]
db: fix a few comments i missed

4 years agoreports: update db tables, combine api impl
eiknat [Wed, 21 Oct 2020 00:31:01 +0000 (20:31 -0400)]
reports: update db tables, combine api impl

4 years agoreports: initial reports api commit
eiknat [Tue, 13 Oct 2020 23:32:35 +0000 (19:32 -0400)]
reports: initial reports api commit

4 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Wed, 11 Nov 2020 19:18:42 +0000 (13:18 -0600)]
Merge remote-tracking branch 'yerba/main' into main

4 years agoMerge pull request 'Add pending status for federated follows' (#130) from pending...
dessalines [Wed, 11 Nov 2020 19:18:27 +0000 (19:18 +0000)]
Merge pull request 'Add pending status for federated follows' (#130) from pending-follow into main

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

4 years agoAdd user_inbox check that activities are really addressed to local users
Felix Ableitner [Wed, 11 Nov 2020 16:40:45 +0000 (17:40 +0100)]
Add user_inbox check that activities are really addressed to local users

4 years agoFix unit tests
Felix Ableitner [Tue, 10 Nov 2020 16:11:08 +0000 (17:11 +0100)]
Fix unit tests

4 years agoVersion v0.8.3
Dessalines [Wed, 11 Nov 2020 13:57:33 +0000 (07:57 -0600)]
Version v0.8.3

4 years agoMerge pull request #1261 from LemmyNet/more-tests-2
Dessalines [Tue, 10 Nov 2020 18:39:01 +0000 (13:39 -0500)]
Merge pull request #1261 from LemmyNet/more-tests-2

Adding some more integration tests for locked posts and bans.

4 years agoAdding some more integration tests for locked posts and bans.
Dessalines [Tue, 10 Nov 2020 16:53:35 +0000 (10:53 -0600)]
Adding some more integration tests for locked posts and bans.

4 years agoAdd pending status for federated follows
Felix Ableitner [Tue, 10 Nov 2020 15:45:10 +0000 (16:45 +0100)]
Add pending status for federated follows

4 years agoMerge pull request 'Enforce post lock in federation inbox' (#129) from enforce-post...
dessalines [Tue, 10 Nov 2020 13:16:13 +0000 (13:16 +0000)]
Merge pull request 'Enforce post lock in federation inbox' (#129) from enforce-post-lock into main

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

4 years agoMerge pull request 'Separate logic for user and community inbox' (#123) from rewrite...
dessalines [Tue, 10 Nov 2020 13:14:40 +0000 (13:14 +0000)]
Merge pull request 'Separate logic for user and community inbox' (#123) from rewrite-inbox into main

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

4 years agoFixed bug where comments with mentions were treated as private message
Felix Ableitner [Mon, 9 Nov 2020 18:18:23 +0000 (19:18 +0100)]
Fixed bug where comments with mentions were treated as private message

4 years agoEnforce post lock in federation inbox
Felix Ableitner [Mon, 9 Nov 2020 16:06:54 +0000 (17:06 +0100)]
Enforce post lock in federation inbox

4 years agoEnforce site and community bans for federated users
Felix Ableitner [Mon, 9 Nov 2020 14:29:36 +0000 (15:29 +0100)]
Enforce site and community bans for federated users

4 years agoSeparate logic for user and community inbox
Felix Ableitner [Wed, 28 Oct 2020 16:14:18 +0000 (17:14 +0100)]
Separate logic for user and community inbox

more refactoring with tons of changes:

- inbox functions return LemmyError instead of HttpResponse
- announce is done directly in community inbox
- reorganized functions for handling inbox activities
- additional checks for private messages
- moved inbox handler functions for post, comment, vote into separete file
- ensure that posts, comments etc are addressed to public (ref #1220)
- probably more

4 years agoVersion v0.8.2
Dessalines [Fri, 6 Nov 2020 13:06:50 +0000 (07:06 -0600)]
Version v0.8.2

4 years agoIn activity table, remove `user_id` and add `sensitive` (#127)
nutomic [Fri, 6 Nov 2020 13:06:47 +0000 (13:06 +0000)]
In activity table, remove `user_id` and add `sensitive` (#127)

Forgot to add migrations

Add `sensitive` column to activities table, so PMs arent served over HTTP

Remove user_id column from actvity table

Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/127

4 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Fri, 6 Nov 2020 13:05:22 +0000 (07:05 -0600)]
Merge remote-tracking branch 'yerba/main' into main