Resolve conflicts
[akkoma] / rel / files / installation / pleroma.service
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release/1.0' into 'develop'
2019-06-28 lainMerge branch 'release-docs' into 'develop'
2019-06-22 rinpatchMerge branch 'develop' into release-docs
2019-06-22 rinpatchAdd a systemd service for OTP releases