Ivan Tashkinov 5992382cf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex		2021-02-11 19:31:57 +03:00
..
gettext	Translated using Weblate (Portuguese (Portugal))	2021-01-18 21:19:25 +00:00
repo	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-11 19:31:57 +03:00
scrubbers	scrubbers/default: Add ruby element and it's childs	2020-11-25 00:40:21 +01:00
static	Update frontend	2021-02-01 10:12:05 +01:00
templates	truncated_namespace should default to nil	2021-01-13 11:54:00 -06:00