Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships

Browse source

...

This commit is contained in:

Egor Kislitsyn 2019-10-24 14:42:14 +07:00

parent 478f0883eb 17c237ba80

commit 4c1dd55c48

104 changed files with 2081 additions and 1368 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

754

lib/pleroma/user.ex

View file

File diff suppressed because it is too large Load diff