Ivan Tashkinov b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-06 17:12:17 +03:00
..
activity_pub	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 17:12:17 +03:00
admin_api	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
auth
channels
common_api	CommonAPI: Create profile updates as public.	2019-10-05 14:53:50 +02:00
federator
mailer
mastodon_api	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 17:12:17 +03:00
media_proxy
metadata
mongooseim
nodeinfo
oauth	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 11:43:49 +03:00
ostatus
pleroma_api/controllers	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 17:12:17 +03:00
push	Revert subscription refactoring.	2019-09-29 18:43:27 +03:00
rich_media
salmon
streamer	streamer: worker: actually use should_send? consistently	2019-10-04 15:42:25 +00:00
templates	Add MastoFEController	2019-10-02 20:36:08 +07:00
twitter_api	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 17:12:17 +03:00
views	Add MastoFEController	2019-10-02 20:36:08 +07:00
web_finger
websub	Replace Pleroma.FlakeId with flake_id hex package	2019-09-25 17:14:31 +07:00
xml
chat_channel.ex	Fix merge	2019-09-30 19:10:54 +07:00
controller_helper.ex	Extract poll actions from MastodonAPIController to PollController	2019-10-01 11:44:34 +07:00
endpoint.ex	Add remote_ip plug	2019-09-27 21:59:23 +00:00
fallback_redirect_controller.ex
gettext.ex
masto_fe_controller.ex	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 17:12:17 +03:00
metadata.ex
oauth.ex
rel_me.ex
router.ex	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 17:12:17 +03:00
translation_helpers.ex	Discard identifier, if empty	2019-10-01 19:43:22 +03:00
uploader_controller.ex
web.ex