Rin Toshaka dec23500d8 Resolve merge conflict

2018-12-30 21:00:40 +01:00

..

mix/tasks/pleroma

Change 'name' to 'instance_name' so option is used when running non-interactive

2018-12-29 12:43:54 +01:00

pleroma

Resolve merge conflict

2018-12-30 21:00:40 +01: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