kaniini c9b418e547 Merge branch 'develop' into 'oembed_provider' ... # Conflicts: # lib/pleroma/activity.ex		2019-01-25 05:00:47 +00:00
..
mix/tasks/pleroma	Mix.Tasks.Pleroma.Instance: Generate signing_salt	2019-01-21 01:16:41 +01:00
pleroma	Merge branch 'develop' into 'oembed_provider'	2019-01-25 05:00:47 +00:00
jason_types.ex
transports.ex
xml_builder.ex