lib/pleroma/web/salmon/salmon.ex · 833161b5d21f85e2276cd0cee3e148ecbe6e1f05 · Pleroma / pleroma · GitLab

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