Skip to content
GitLab
Explore
Sign in
Register
jp
pleroma
Repository
pleroma
test
web
pleroma_api
controllers
emoji_api_controller_test.exs
Find file
Blame
History
Permalink
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
· 39ce894a
Ivan Tashkinov
authored
Jan 10, 2020
# Conflicts: # lib/pleroma/user.ex
39ce894a