Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

Browse source

...

This commit is contained in:

lain 2020-05-04 10:43:20 +02:00

parent 9249742f13 095635453a

commit c40afe5ba0

167 changed files with 3178 additions and 1694 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

936

test/web/pleroma_api/controllers/emoji_api_controller_test.exs

View file

File diff suppressed because it is too large Load diff