Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ...

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

2019-02-04 20:50:28 +07:00

..

mix/tasks/pleroma

Mix.Tasks.Pleroma.Instance: Generate signing_salt

2019-01-21 01:16:41 +01:00

pleroma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

2019-02-04 20:50:28 +07: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