Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes

Browse source

...

This commit is contained in:

lain 2020-11-04 16:51:42 +01:00

parent 8f5589cf66 78cea44553

commit dd2b3a8da9

767 changed files with 8187 additions and 4306 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2174

test/pleroma/user_test.exs Normal file

View file

File diff suppressed because it is too large Load diff