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

..

handlers

Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1

2019-01-21 08:00:41 +01:00

activity_representer.ex

Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1

2019-01-21 08:00:41 +01:00

feed_representer.ex

update copyright years to 2019

2018-12-31 15:41:47 +00:00

ostatus_controller.ex

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

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

ostatus.ex

[#534] Made federation push sender be determined basing on content instead of referer header. Updated tests.

2019-01-29 13:12:28 +03:00

user_representer.ex

update copyright years to 2019

2018-12-31 15:41:47 +00:00