Merge branch 'develop' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 16 Dec 2018 12:13:32 +0000 (12:13 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 16 Dec 2018 12:13:32 +0000 (12:13 +0000)
commit41e3401c5cb4f57291b324c1d3377660f7fc356e
treee8bdefb90551986709fb234a29e06997eb709fed
parent28478a9c4f652e67de659adb93155a0dfda4b09f
parent75f2177d5b68d610b859c18eddb14540d1ee92b5
Merge branch 'develop' into 'develop'

Added init file for OpenBSD

See merge request pleroma/pleroma!549