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
..
administration	Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files	2021-02-06 09:42:17 +00:00
configuration	[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.	2021-02-23 13:52:28 +03:00
development	Remove :auth, :enforce_oauth_admin_scope_usage	2021-02-17 20:47:38 +03:00
installation	add missing sudo prefix in install doc	2021-01-23 16:56:11 +00:00
clients.md	clients.md: Add AndStatus, note supported protocols	2020-10-26 03:23:47 +01:00
index.md