sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-29 03:46:04 +01:00
Code Issues Releases Wiki Activity
39ce894a07
pleroma/lib
History
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