Skip to content
GitLab
Explore
Sign in
Register
Pleroma
pleroma
Repository
pleroma
config
config.exs
Find file
Blame
History
Permalink
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
· 835ac215
Ivan Tashkinov
authored
Dec 10, 2019
# Conflicts: # CHANGELOG.md
835ac215