Skip to content
GitLab
Explore
Sign in
Register
Hakaba Hitoyo
pleroma
Repository
pleroma
docs
config.md
Find file
Blame
History
Permalink
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
· 48591aab
minibikini
authored
Jan 09, 2019
# Conflicts: # docs/config.md
48591aab