1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-25 16:35:47 +01:00
pleroma/test/web/mastodon_api
Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
#	lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
..
controllers configurable lifetime for ephemeral activities 2020-09-10 21:51:59 +03:00
views [#2497] Added missing alias, removed legacy :adapter option specification for HTTP.get/_. 2020-09-09 19:30:42 +03:00
mastodon_api_controller_test.exs
mastodon_api_test.exs MastodonAPITest: Do the needful 2020-08-04 15:08:51 +02:00