Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
authorlain <lain@soykaf.club>
Mon, 23 Nov 2020 14:18:19 +0000 (15:18 +0100)
committerlain <lain@soykaf.club>
Mon, 23 Nov 2020 14:18:19 +0000 (15:18 +0100)
commitf9a4cf2097c0ccc3987517b581aebc1197b2a4a3
tree74a5ac03807d93c37527ddba93cf74e35da53d2e
parente4289792d28cb38c520e03df2ed82f6f30eb4c51
parente07f8f8aa5f53e2746b823559742f597348080f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
CHANGELOG.md
lib/pleroma/application.ex