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

Browse source

...

This commit is contained in:

lain 2020-08-25 15:16:20 +02:00

parent 361aa22e28 f891e2b2f1

commit ea2b5c07e3

191 changed files with 220 additions and 466 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

4

priv/static/sw-pleroma.js

View file

File diff suppressed because one or more lines are too long