Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions ...

# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock

2018-12-06 19:55:58 +07:00

..

account_view.ex

mastodon api: relationship view: better handle no pre-existing follow activity

2018-10-05 23:50:13 +00:00

filter_view.ex

[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable

2018-08-27 15:09:06 +02:00

list_view.ex

MastoAPI: add lists.

2018-05-24 13:18:39 +03:00

mastodon_view.ex

Add Mastodon frontend.

2017-11-12 14:23:05 +01:00

push_subscription_view.ex

Mastodon API: Support push subscription CRUD

2018-09-22 07:04:01 +02:00

status_view.ex

Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable

2018-11-03 14:42:47 +01:00