Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

Browse source

...

This commit is contained in:

lain 2020-08-27 15:38:03 +02:00

parent 5dba3a50fc 1c05819c9b

commit 82bf27172c

57 changed files with 165 additions and 2 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

2

priv/static/adminfe/static/js/chunk-176e.5c19378d.js Normal file

View file

File diff suppressed because one or more lines are too long