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

Browse source

...

This commit is contained in:

Roger Braun 2018-02-02 17:14:58 +01:00

parent 2203fa2fdb 3163311098

commit 9a9766d648

11 changed files with 63 additions and 15 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/instance/thumbnail.jpeg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 47 KiB