Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs		2020-05-13 12:42:36 +03:00
..
benchmark.exs	activities generation tasks	2020-03-30 11:42:25 +03:00
config.exs	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-08 21:37:55 +03:00
description.exs	copy/paste fix for descriptions	2020-05-11 09:35:20 +03:00
dev.exs	Enable strict validation mode in dev and test environments	2020-05-04 22:35:28 +04:00
docker.exs	Remove dynamic config as default, add healthcheck	2019-09-03 09:31:52 -04:00
dokku.exs
emoji.txt	Remove longfox emoji set	2019-08-04 04:32:45 +00:00
prod.exs	Set Logger level to :info in prod	2019-12-09 19:11:54 +07:00
releases.exs	some refactor and tests	2020-01-21 18:42:00 +03:00
test.exs	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00