Skip to content
GitLab
Explore
Sign in
Register
Hakaba Hitoyo
pleroma
Repository
pleroma
lib
pleroma
application.ex
Find file
Blame
History
Permalink
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
· 3a3a3996
minibikini
authored
Feb 04, 2019
# Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/federator/federator.ex
3a3a3996