Ivan Tashkinov 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex		2019-09-17 22:53:26 +03:00
..
mix	Merge branch 'admin-config-description' into 'develop'	2019-09-13 12:36:24 +00:00
pleroma	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-09-17 22:53:26 +03:00
jason_types.ex
transports.ex
xml_builder.ex