Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		2019-12-10 08:55:14 +03:00
..
activity_pub	Merge branch 'improve-move-notificaions-api' into 'develop'	2019-12-08 13:07:05 +00:00
admin_api	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03:00
auth
common_api
feed
instances
mastodon_api	Merge branch 'fix/prefer-url-over-search' into 'develop'	2019-12-09 17:55:48 +00:00
media_proxy
metadata
mongooseim
oauth
ostatus	OStatus controller: don't serve json at /notice/, redirect instead	2019-11-25 17:55:17 +03:00
pleroma_api/controllers
plugs
push	added privacy option to push notifications	2019-11-28 22:13:11 +03:00
rich_media
static_fe
streamer	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-29 10:17:59 +03:00
twitter_api	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
views
web_finger
chat_channel_test.exs	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
fallback_test.exs
federator_test.exs
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs