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

Format the code.

2018-03-30 15:01:53 +02:00

transports.ex

Format the code.

2018-03-30 15:01:53 +02:00

xml_builder.ex

Format the code.

2018-03-30 15:01:53 +02:00