Merge branch 'develop' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 23 Jan 2020 02:05:22 +0000 (02:05 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 23 Jan 2020 02:05:22 +0000 (02:05 +0000)
commit73e6bbbe8973d81688e0916e616cd4726ad659c2
treede03b1c232b041bc3785beb9372706948c333f0d
parent6e6f1ead31ba26bc42b14226e3c0876042f0596a
parent89eeadc2a892194ee83c1c885845a93e7ec6e397
Merge branch 'develop' into 'develop'

Updated OpenBSD installation guide for version OpenBSD 6.6

See merge request pleroma/pleroma!2131