kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api' ...

# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex

2018-09-03 14:55:42 +00:00

..

mix/tasks

fix S3 ref in sample config to generate proper path.

2018-08-28 23:49:23 -03:00

pleroma

Merge branch 'develop' into 'feature/staff-discovery-api'

2018-09-03 14:55:42 +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