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