Ivan Tashkinov 829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests ... # Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs		2019-07-09 21:46:16 +03:00
..
mix	reverse proxy tests	2019-07-09 16:54:13 +00:00
pleroma	[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests	2019-07-09 21:46:16 +03:00
healthcheck.ex	Use Pleroma.Config everywhere	2019-05-30 15:33:58 +07:00
jason_types.ex
transports.ex
xml_builder.ex	xml builder: properly escape quotes	2019-05-12 19:04:37 +00:00