Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex		2020-01-10 16:18:32 +03:00
..
mix	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-10 16:18:32 +03:00
jason_types.ex
transports.ex
xml_builder.ex