Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex		2019-09-19 10:59:09 +03:00
..
mix	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
pleroma	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-09-19 10:59:09 +03:00
jason_types.ex
transports.ex
xml_builder.ex