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

Browse source

...

This commit is contained in:

lain 2020-05-07 15:05:40 +02:00

parent 1748e26948 b7635bf2b6

commit fb2d284d28

70 changed files with 2872 additions and 994 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

BIN

priv/static/adminfe/static/fonts/element-icons.535877f.woff

View file

Binary file not shown.

BIN

priv/static/adminfe/static/fonts/element-icons.732389d.ttf

View file

Binary file not shown.