You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex		4 years ago
..
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	4 years ago
configuration	[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.	4 years ago
development	Remove `:auth, :enforce_oauth_admin_scope_usage`	4 years ago
installation	add missing sudo prefix in install doc	4 years ago
clients.md	clients.md: Add AndStatus, note supported protocols	4 years ago
index.md	Removed a space that was too much	4 years ago