kaniini c9b418e547 Merge branch 'develop' into 'oembed_provider' ... # Conflicts: # lib/pleroma/activity.ex		2019-01-25 05:00:47 +00: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' into 'oembed_provider'	2019-01-25 05:00:47 +00:00
ostatus.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
user_representer.ex	update copyright years to 2019	2018-12-31 15:41:47 +00:00