Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ...

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex

2019-02-04 20:50:28 +07:00

..

federator.ex

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

2019-02-04 20:50:28 +07:00

retry_queue.ex

rewrites List.foldl to Enum.each

2019-01-02 21:21:40 +00:00