Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex		2021-02-23 13:58:35 +03:00
..
gettext	Translated using Weblate (Portuguese (Portugal))	2021-01-18 21:19:25 +00:00
repo	[#3213] hashtags: altered name type to text. hashtags_objects: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.	2021-02-22 23:26:07 +03:00
scrubbers	scrubbers/default: Add ruby element and it's childs	2020-11-25 00:40:21 +01:00
static	replace avi.png	2021-02-15 15:44:27 +02:00
templates	truncated_namespace should default to nil	2021-01-13 11:54:00 -06:00