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
..
mailer
email_view.ex
embed_view.ex
error_helpers.ex
error_view.ex
layout_view.ex
masto_fe_view.ex	Merge branch 'develop' into 'cleanup/masto_fe-default_settings'	2020-07-27 16:35:47 +00:00
streamer_view.ex	Credo fixes.	2020-06-05 12:45:25 +02:00