kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay' ...

# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex

2018-08-26 21:06:15 +00:00

..

mix/tasks

Merge branch 'develop' into 'feature/relay'

2018-08-26 21:06:15 +00:00

pleroma

Merge branch 'develop' into 'feature/relay'

2018-08-26 21:06:15 +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