Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator

Browse source

...

This commit is contained in:

Lain Soykaf 2020-04-30 22:44:31 +02:00

parent 32b8386ede a81342a234

commit 93f64aba78

17 changed files with 1580 additions and 947 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