akkoma/lib
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
..
mix/tasks/pleroma Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure) 2019-02-09 16:31:17 +01:00
pleroma Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-11 13:54:21 +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