lain e1a1c8e7de Merge branch 'develop' into 'cleanup/masto_fe-default_settings' ...

# Conflicts:
#   lib/pleroma/web/views/masto_fe_view.ex

2020-07-27 16:35:47 +00:00

..

mix

Ensure Oban is available during mix tasks.

2020-07-24 12:06:56 -05:00

pleroma

Merge branch 'develop' into 'cleanup/masto_fe-default_settings'

2020-07-27 16:35:47 +00:00

jason_types.ex

…

transports.ex

…

xml_builder.ex

…