Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

Browse source

# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/config.ex

...

This commit is contained in:

Ivan Tashkinov 2021-02-23 13:58:35 +03:00

parent 77f3da0358 484ba5d062

commit 8f88a90ca3

61 changed files with 542 additions and 520 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/images/avi.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 726 B After Width:  |  Height:  |  Size: 1 KiB