Alex S bdfa3a6fa8 Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex		2019-05-01 12:29:33 +07:00
..
mix/tasks/pleroma	Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix	2019-04-22 11:02:31 +03:00
pleroma	Merging with develop	2019-05-01 12:29:33 +07:00
healthcheck.ex	Feature/826 healthcheck endpoint	2019-04-22 07:19:53 +00:00
jason_types.ex
transports.ex
xml_builder.ex