distraction.party/lib/pleroma/web/activity_pub
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
..
mrf removed a debug thingy 2019-02-04 11:22:25 +00:00
views Revert "Merge branch 'feature/split-hide-network' into 'develop'" 2019-02-01 20:22:58 +00:00
activity_pub.ex Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-04 20:50:28 +07:00
activity_pub_controller.ex Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-04 20:50:28 +07:00
mrf.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
relay.ex activitypub: relay: chase selective public announce changes 2019-01-17 23:21:31 +00:00
transmogrifier.ex activitypub: transmogrifier: fix follow request rejections 2019-01-29 11:57:46 +00:00
utils.ex Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-04 20:50:28 +07:00