Skip to content
GitLab
Explore
Sign in
Register
mfc
pleroma
Repository
pleroma
config
config.exs
Find file
Blame
History
Permalink
Merge remote-tracking branch 'remotes/pleroma/develop' into merge/develop-20200328
· 339c3d4d
Ivan Tashkinov
authored
Apr 02, 2020
# Conflicts: # lib/pleroma/application.ex # lib/pleroma/web/metadata/opengraph.ex
339c3d4d