Skip to content
GitLab
Explore
Sign in
Register
Pleroma
pleroma
Repository
pleroma
mix.exs
Find file
Blame
History
Permalink
Merge branch 'develop' into feature/compat/push-subscriptions
· 49444981
minibikini
authored
Dec 06, 2018
# Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex
49444981