Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
authorlain <lain@soykaf.club>
Mon, 27 Jul 2020 16:35:47 +0000 (16:35 +0000)
committerlain <lain@soykaf.club>
Mon, 27 Jul 2020 16:35:47 +0000 (16:35 +0000)
commite1a1c8e7de5e10fa64d168dc5d35a80b96767395
treec0057448e323c730bea2c76cecf9efb85ef14181
parent4a6389316dac53c1ca2ec36d160690476d881185
parent2a3abfd326f0cbb588dfe66a23e9783be3038a5e
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'

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