Skip to content
GitLab
Explore
Sign in
Register
Maksim
pleroma
Repository
pleroma
lib
pleroma
web
views
masto_fe_view.ex
Find file
Blame
History
Permalink
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
· e1a1c8e7
lain
authored
Jul 27, 2020
# Conflicts: # lib/pleroma/web/views/masto_fe_view.ex
e1a1c8e7