Alex Gleason d9746ae4cb Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' ...

Handle Reject for already-accepted Follows properly

Closes #2766 and #2802

See merge request pleroma/pleroma!3568

2021-12-23 16:00:16 +00:00

..

config

Load an emoji.txt specific to the test env

2021-02-03 16:40:59 -06:00

credo/check/consistency

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00

fixtures

Merge branch 'features/ingestion-page' into 'develop'

2021-07-12 05:05:49 +00:00

instance_static

…

mix

Upgrade Ecto to v3.6.2, remove deprecated ecto_explain

2021-07-17 13:53:19 -05:00

pleroma

Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'

2021-12-23 16:00:16 +00:00

support

CI: Bump lint stage to elixir-1.12

2021-10-06 08:11:05 +02:00

test_helper.exs

Skip erratic tests

2021-12-21 22:04:15 -06:00