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
..
builders
captcha_mock.ex
channel_case.ex
conn_case.ex	Unbreak all the tests.	2019-02-03 18:54:39 +01:00
data_case.ex	Unbreak all the tests.	2019-02-03 18:54:39 +01:00
factory.ex
helpers.ex
http_request_mock.ex	Merge branch '534_federation_targets_reachability' into 'develop'	2019-02-01 09:14:35 +00:00
jobs_worker_mock.ex
ostatus_mock.ex
websocket_client.ex
websub_mock.ex