]> Untitled Git - lemmy.git/log
lemmy.git
3 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

3 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

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

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

3 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.

3 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.

3 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

3 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

3 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

3 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

3 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

3 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

3 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

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

3 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

3 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

4 years agoFix federation of community removal/deletion, added docs (#125)
nutomic [Thu, 5 Nov 2020 20:19:06 +0000 (20:19 +0000)]
Fix federation of community removal/deletion, added docs (#125)

Adding a federation test for community deletes / removes.

Add missing docs for community deletion/removal (fixes #1250)

Fix federation of community deletion/removal (fixes #1253)

Co-authored-by: Dessalines <tyhou13@gmx.com>
Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/125

4 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Thu, 5 Nov 2020 20:17:35 +0000 (14:17 -0600)]
Merge remote-tracking branch 'yerba/main' into main

4 years agoMerge pull request 'Dont send email notifications to banned users (fixes #1251)'...
dessalines [Thu, 5 Nov 2020 19:14:49 +0000 (19:14 +0000)]
Merge pull request 'Dont send email notifications to banned users (fixes #1251)' (#126) from dont-email-banned-user into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/126

4 years agoAlso check for ban when sending private message notification
Felix Ableitner [Thu, 5 Nov 2020 15:13:01 +0000 (16:13 +0100)]
Also check for ban when sending private message notification

4 years agoMerge pull request #1252 from LemmyNet/yerbamate-change-tld
Dessalines [Thu, 5 Nov 2020 13:41:12 +0000 (08:41 -0500)]
Merge pull request #1252 from LemmyNet/yerbamate-change-tld

Change domain of yerbamate.dev to yerbamate.ml

4 years agoDont send email notifications to banned users (fixes #1251)
Felix Ableitner [Thu, 5 Nov 2020 12:43:46 +0000 (13:43 +0100)]
Dont send email notifications to banned users (fixes #1251)

4 years agoChange domain of yerbamate.dev to yerbamate.ml
Felix Ableitner [Tue, 3 Nov 2020 21:50:59 +0000 (22:50 +0100)]
Change domain of yerbamate.dev to yerbamate.ml

4 years agoUpgrading pictrs to v0.2.5 (#1249)
Dessalines [Mon, 2 Nov 2020 18:12:21 +0000 (13:12 -0500)]
Upgrading pictrs to v0.2.5 (#1249)

4 years agoMerge pull request #1246 from knkski/pictrs-url-variable
Dessalines [Mon, 2 Nov 2020 03:45:03 +0000 (22:45 -0500)]
Merge pull request #1246 from knkski/pictrs-url-variable

Fix hardcoded pictrs URL reference

4 years agoMerge pull request #1247 from knkski/iframely-url-setting
Dessalines [Mon, 2 Nov 2020 03:44:28 +0000 (22:44 -0500)]
Merge pull request #1247 from knkski/iframely-url-setting

Add iframely_url setting

4 years agoMerge branch 'main' of https://github.com/lemmynet/lemmy into main
Dessalines [Mon, 2 Nov 2020 03:26:36 +0000 (21:26 -0600)]
Merge branch 'main' of https://github.com/lemmynet/lemmy into main

4 years agoChanging docs formattin, running format.
Dessalines [Mon, 2 Nov 2020 03:26:00 +0000 (21:26 -0600)]
Changing docs formattin, running format.

4 years agoParameterize docs directory (#1245)
Kenneth Koski [Mon, 2 Nov 2020 03:21:15 +0000 (21:21 -0600)]
Parameterize docs directory (#1245)

Adds `docs_dir` setting for configurable documentation location

4 years agoAdd iframely_url setting
Kenneth Koski [Sat, 31 Oct 2020 22:08:03 +0000 (17:08 -0500)]
Add iframely_url setting

4 years agoFix hardcoded pictrs URL reference
Kenneth Koski [Sat, 31 Oct 2020 21:52:54 +0000 (16:52 -0500)]
Fix hardcoded pictrs URL reference

Reads the URL from Settings instead

4 years agoUpdate configuration documentation
Kenneth Koski [Sat, 31 Oct 2020 21:28:09 +0000 (16:28 -0500)]
Update configuration documentation

4 years agoParameterize config file location
Kenneth Koski [Sat, 31 Oct 2020 21:25:15 +0000 (16:25 -0500)]
Parameterize config file location

Allows `config.hjson` to be located on a configurable path.

4 years agoGetUserDetails doesnt return users own email (#1240)
eiknat [Fri, 30 Oct 2020 22:19:47 +0000 (18:19 -0400)]
GetUserDetails doesnt return users own email (#1240)

* user: GetUserDetails doesnt return users own email

* user: rename get_user to get_user_dangerous, apply suggested changes

4 years agoFixing missing community doc.
Dessalines [Fri, 30 Oct 2020 17:46:11 +0000 (12:46 -0500)]
Fixing missing community doc.

4 years agoUpdate cargo deps, upgrading lettre. #789 (#1234)
Dessalines [Fri, 30 Oct 2020 17:19:00 +0000 (13:19 -0400)]
Update cargo deps, upgrading lettre. #789 (#1234)

* Update cargo deps, upgrading lettre. #789

* Adding a comment

* Adding some better expect messages.

* Fixing lettre email.

4 years agoMerge pull request #1242 from ShadowJonathan/patch-1
Dessalines [Fri, 30 Oct 2020 15:28:53 +0000 (11:28 -0400)]
Merge pull request #1242 from ShadowJonathan/patch-1

Update about_features.md

4 years agoUpdate about_features.md
Jonathan de Jong [Fri, 30 Oct 2020 08:46:30 +0000 (09:46 +0100)]
Update about_features.md

...in accordance with the readme.

4 years agoMerge pull request 'Ignore incoming activities which have been received before, add...
dessalines [Tue, 27 Oct 2020 16:26:16 +0000 (16:26 +0000)]
Merge pull request 'Ignore incoming activities which have been received before, add `/activities` endpoint' (#118) from activity-checks into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/118

4 years agoMerge pull request 'In comment create/update, include parent creator in cc (ref ...
dessalines [Tue, 27 Oct 2020 16:15:20 +0000 (16:15 +0000)]
Merge pull request 'In comment create/update, include parent creator in cc (ref #698)' (#122) from comment-parent-cc into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/122

4 years agoIn comment create/update, include parent creator in cc (ref #698)
Felix Ableitner [Tue, 27 Oct 2020 13:53:22 +0000 (14:53 +0100)]
In comment create/update, include parent creator in cc (ref #698)

4 years agoFixing cache dev dockerfile
Dessalines [Tue, 27 Oct 2020 15:57:40 +0000 (10:57 -0500)]
Fixing cache dev dockerfile

4 years agoUse docker cache for docker/dev/
Felix Ableitner [Sat, 24 Oct 2020 15:23:45 +0000 (17:23 +0200)]
Use docker cache for docker/dev/

4 years agoMerge branch 'main' of https://github.com/lemmynet/lemmy into main
Dessalines [Tue, 27 Oct 2020 00:18:28 +0000 (19:18 -0500)]
Merge branch 'main' of https://github.com/lemmynet/lemmy into main

4 years agoMerge branch 'prod_dockerfile_update' into main
Dessalines [Tue, 27 Oct 2020 00:16:33 +0000 (19:16 -0500)]
Merge branch 'prod_dockerfile_update' into main

4 years agoTrying a target fix.
Dessalines [Mon, 26 Oct 2020 22:32:50 +0000 (17:32 -0500)]
Trying a target fix.

4 years agoTrying a target fix.
Dessalines [Mon, 26 Oct 2020 20:50:37 +0000 (15:50 -0500)]
Trying a target fix.

4 years agoTrying a permissions fix.
Dessalines [Mon, 26 Oct 2020 18:35:19 +0000 (13:35 -0500)]
Trying a permissions fix.

4 years agoSimplifying prod build, using musl stable. (#1235)
Dessalines [Mon, 26 Oct 2020 17:33:43 +0000 (13:33 -0400)]
Simplifying prod build, using musl stable. (#1235)

4 years agoSimplifying prod build, using musl stable.
Dessalines [Mon, 26 Oct 2020 17:18:47 +0000 (12:18 -0500)]
Simplifying prod build, using musl stable.

4 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Mon, 26 Oct 2020 15:34:40 +0000 (10:34 -0500)]
Merge remote-tracking branch 'yerba/main' into main

4 years agoMerge pull request 'Limit amount of HTTP requests to handle activities (fixes #1221...
dessalines [Mon, 26 Oct 2020 15:35:39 +0000 (15:35 +0000)]
Merge pull request 'Limit amount of HTTP requests to handle activities (fixes #1221)' (#117) from request-limit into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/117

4 years agoMerge pull request 'docker/lemmy.hjson is missing field email.use_tls (fixes #1231...
dessalines [Mon, 26 Oct 2020 13:49:05 +0000 (13:49 +0000)]
Merge pull request 'docker/lemmy.hjson is missing field email.use_tls (fixes #1231)' (#120) from lemmy-config-use-tls into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/120

4 years agoAdd /activities endpoint (ref #1220)
Felix Ableitner [Fri, 23 Oct 2020 13:02:45 +0000 (15:02 +0200)]
Add /activities endpoint (ref #1220)

4 years agoAdding image endpoints to docs. Fixes #1226 (#1232)
Dessalines [Mon, 26 Oct 2020 11:07:23 +0000 (07:07 -0400)]
Adding image endpoints to docs. Fixes #1226 (#1232)

4 years agodocker/lemmy.hjson is missing field email.use_tls (fixes #1231)
Felix Ableitner [Mon, 26 Oct 2020 10:28:32 +0000 (11:28 +0100)]
docker/lemmy.hjson is missing field email.use_tls (fixes #1231)

4 years agoUpdating readme to ref join.lemmy.ml
Dessalines [Sun, 25 Oct 2020 15:34:22 +0000 (10:34 -0500)]
Updating readme to ref join.lemmy.ml

4 years agoVersion v0.8.1
Dessalines [Sat, 24 Oct 2020 20:15:48 +0000 (15:15 -0500)]
Version v0.8.1

4 years agoUpdating lemmy.hjson config.
Dessalines [Sat, 24 Oct 2020 20:14:58 +0000 (15:14 -0500)]
Updating lemmy.hjson config.

4 years agoFix matrix room link.
Dessalines [Sat, 24 Oct 2020 20:10:22 +0000 (15:10 -0500)]
Fix matrix room link.

4 years agoMerge pull request #1229 from IronOxidizer/fix-docker-dev
Dessalines [Fri, 23 Oct 2020 18:04:30 +0000 (14:04 -0400)]
Merge pull request #1229 from IronOxidizer/fix-docker-dev

Removed docker root prefix, add pictrs dir

4 years agoRemoved docker root prefix, add pictrs dir
Iron Oxidizer [Fri, 23 Oct 2020 17:14:30 +0000 (13:14 -0400)]
Removed docker root prefix, add pictrs dir

4 years agoIgnore incoming activities which have been received before (ref #1220)
Felix Ableitner [Fri, 23 Oct 2020 12:29:56 +0000 (14:29 +0200)]
Ignore incoming activities which have been received before (ref #1220)

4 years agoMerge pull request #1225 from LemmyNet/fix_remove_icons
Dessalines [Thu, 22 Oct 2020 18:56:55 +0000 (14:56 -0400)]
Merge pull request #1225 from LemmyNet/fix_remove_icons

Fix invalid url error when removing icons. Fixes #1219

4 years agoMerge pull request #1223 from LemmyNet/remove_cache_headers
Dessalines [Thu, 22 Oct 2020 18:56:43 +0000 (14:56 -0400)]
Merge pull request #1223 from LemmyNet/remove_cache_headers

Remove cache headers. Fixes #1222

4 years agoMerge pull request 'Organise activity receive files by object type, not by activity...
dessalines [Thu, 22 Oct 2020 18:55:28 +0000 (18:55 +0000)]
Merge pull request 'Organise activity receive files by object type, not by activity type' (#115) from inbox-refactoring-2 into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/115

4 years agoMerge pull request 'Dont allow localhost or raw IPs in activitypub IDs (ref #1221...
dessalines [Thu, 22 Oct 2020 18:55:11 +0000 (18:55 +0000)]
Merge pull request 'Dont allow localhost or raw IPs in activitypub IDs (ref #1221)' (#116) from disallow-localhost-urls into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/116

4 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Thu, 22 Oct 2020 18:55:01 +0000 (13:55 -0500)]
Merge remote-tracking branch 'yerba/main' into main

4 years agoLimit amount of HTTP requests to handle activities (fixes #1221)
Felix Ableitner [Thu, 22 Oct 2020 18:27:32 +0000 (20:27 +0200)]
Limit amount of HTTP requests to handle activities (fixes #1221)

4 years agoFix invalid url error when removing icons. Fixes #1219
Dessalines [Thu, 22 Oct 2020 17:23:25 +0000 (12:23 -0500)]
Fix invalid url error when removing icons. Fixes #1219

4 years agoRemove cache headers. Fixes #1222
Dessalines [Thu, 22 Oct 2020 16:53:53 +0000 (11:53 -0500)]
Remove cache headers. Fixes #1222

4 years agoDont allow localhost or raw IPs in activitypub IDs (ref #1221)
Felix Ableitner [Thu, 22 Oct 2020 16:12:43 +0000 (18:12 +0200)]
Dont allow localhost or raw IPs in activitypub IDs (ref #1221)

4 years agoFixing ansible for ubuntu 20.04 (#1218)
Dessalines [Thu, 22 Oct 2020 14:32:56 +0000 (10:32 -0400)]
Fixing ansible for ubuntu 20.04 (#1218)

* Fixing ansible for ubuntu 20.04

* Changing federation to false.

4 years agoOrganise activity receive files by object type, not by activity type
Felix Ableitner [Wed, 21 Oct 2020 17:37:50 +0000 (19:37 +0200)]
Organise activity receive files by object type, not by activity type

4 years agoMerge pull request 'Also return json for long accept header with profile link (ref...
dessalines [Wed, 21 Oct 2020 16:33:31 +0000 (16:33 +0000)]
Merge pull request 'Also return json for long accept header with profile link (ref #1216)' (#114) from json-headers into main

Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/114

4 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Wed, 21 Oct 2020 16:32:25 +0000 (11:32 -0500)]
Merge remote-tracking branch 'yerba/main' into main

4 years agoMerge pull request #1217 from lo48576/fix/outdated-readme-link
Dessalines [Wed, 21 Oct 2020 13:55:17 +0000 (09:55 -0400)]
Merge pull request #1217 from lo48576/fix/outdated-readme-link

Fix outdated links in README

4 years agoAlso return json for long accept header with profile link (ref #1216)
Felix Ableitner [Wed, 21 Oct 2020 13:48:43 +0000 (15:48 +0200)]
Also return json for long accept header with profile link (ref #1216)

4 years agoFix outdated links in README
YOSHIOKA Takuma [Wed, 21 Oct 2020 13:23:09 +0000 (22:23 +0900)]
Fix outdated links in README

4 years agoFix IP forwarding headers. Fixes #1214 (#1215)
Dessalines [Wed, 21 Oct 2020 09:47:45 +0000 (05:47 -0400)]
Fix IP forwarding headers. Fixes #1214 (#1215)

4 years agoUpgrade pictrs to v0.2.4-r0 (#1212)
Dessalines [Tue, 20 Oct 2020 10:44:55 +0000 (06:44 -0400)]
Upgrade pictrs to v0.2.4-r0 (#1212)

4 years agoMerge pull request #1209 from LemmyNet/fix-actor-name-confusion
Dessalines [Mon, 19 Oct 2020 15:52:35 +0000 (11:52 -0400)]
Merge pull request #1209 from LemmyNet/fix-actor-name-confusion

Swap name and preferredUsername apub fields

4 years agoMerge pull request #1210 from LemmyNet/apub-code-docs
Dessalines [Mon, 19 Oct 2020 15:47:17 +0000 (11:47 -0400)]
Merge pull request #1210 from LemmyNet/apub-code-docs

Create rustdoc for activitypub code

4 years agoCreate rustdoc for activitypub code
Felix Ableitner [Mon, 19 Oct 2020 14:29:35 +0000 (16:29 +0200)]
Create rustdoc for activitypub code

4 years agoMake lemmy-ui restart: always
Felix Ableitner [Mon, 19 Oct 2020 10:18:05 +0000 (12:18 +0200)]
Make lemmy-ui restart: always

4 years agoAdding some comments to defaults.hjson (#1207)
Dessalines [Fri, 16 Oct 2020 20:46:40 +0000 (16:46 -0400)]
Adding some comments to defaults.hjson (#1207)

* Adding some comments to defaults.hjson

* Link to docs for allow/blocklist.

4 years agoSwap name and preferredUsername apub fields
Felix Ableitner [Fri, 16 Oct 2020 20:44:40 +0000 (22:44 +0200)]
Swap name and preferredUsername apub fields

4 years agoVersion v0.8.0
Dessalines [Fri, 16 Oct 2020 14:12:54 +0000 (09:12 -0500)]
Version v0.8.0

4 years agoAdding to releases.md
Dessalines [Fri, 16 Oct 2020 14:10:43 +0000 (09:10 -0500)]
Adding to releases.md

4 years agoFixing clippy.
Dessalines [Fri, 16 Oct 2020 14:09:37 +0000 (09:09 -0500)]
Fixing clippy.

4 years agoAdding API and APUB URL checks for banners and icons. Fixes #1199 (#1200)
Dessalines [Thu, 15 Oct 2020 18:23:56 +0000 (14:23 -0400)]
Adding API and APUB URL checks for banners and icons. Fixes #1199 (#1200)

* Adding API and APUB URL checks for banners and icons. Fixes #1199

* Adding a check optional url.

* Missed a few.

4 years agoAdding references to lemmy types from docs. (#1203)
Dessalines [Thu, 15 Oct 2020 17:56:16 +0000 (13:56 -0400)]
Adding references to lemmy types from docs. (#1203)

* Adding references to lemmy types from docs.

* Updating TOC.

* Updating docs.

4 years agoMerge pull request #1206 from LemmyNet/verify-activity-domains2
Dessalines [Thu, 15 Oct 2020 15:18:57 +0000 (11:18 -0400)]
Merge pull request #1206 from LemmyNet/verify-activity-domains2

Verify activity domains 2

4 years agoMerge pull request #1201 from LemmyNet/verify-activity-domains
Dessalines [Thu, 15 Oct 2020 15:15:25 +0000 (11:15 -0400)]
Merge pull request #1201 from LemmyNet/verify-activity-domains

Add method verify_activity_domains_valid() (ref #1196)

4 years agoAlso verify activity domains in shared inbox (fixes #1196)
Felix Ableitner [Thu, 15 Oct 2020 13:38:49 +0000 (15:38 +0200)]
Also verify activity domains in shared inbox (fixes #1196)

4 years agoAdd method verify_activity_domains_valid() (ref #1196)
Felix Ableitner [Wed, 14 Oct 2020 15:34:11 +0000 (17:34 +0200)]
Add method verify_activity_domains_valid() (ref #1196)

4 years agoMerge pull request #1202 from LemmyNet/pict-rs-v2-dess
Dessalines [Wed, 14 Oct 2020 19:46:02 +0000 (15:46 -0400)]
Merge pull request #1202 from LemmyNet/pict-rs-v2-dess

Pict rs v2 dess

4 years agoAltering lemmy pict-rs-v2 forwarding.
Dessalines [Wed, 14 Oct 2020 16:48:10 +0000 (11:48 -0500)]
Altering lemmy pict-rs-v2 forwarding.

4 years agoMerge branch 'asonix/pict-rs-v2' of https://github.com/asonix/lemmy into asonix-asoni...
Dessalines [Wed, 14 Oct 2020 15:14:25 +0000 (10:14 -0500)]
Merge branch 'asonix/pict-rs-v2' of https://github.com/asonix/lemmy into asonix-asonix/pict-rs-v2

4 years agoMerge remote-tracking branch 'yerba/main' into main
Dessalines [Tue, 13 Oct 2020 18:30:32 +0000 (13:30 -0500)]
Merge remote-tracking branch 'yerba/main' into main