Merge branch 'patch-2' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 28 Jan 2019 08:23:21 +0000 (08:23 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 28 Jan 2019 08:23:21 +0000 (08:23 +0000)
commitb380b4898d3165c41a0e2b09b0727cad6b58f925
treea00904e6940576dfb3b01bf23c7a3b8bcedcdfba
parent6db792124ba5269a6d134e2778779261f44bd635
parent9e43a28bc36777737a56d02dccf831cf00fcddc4
Merge branch 'patch-2' into 'develop'

Update the openrc service's retry with the correct format

See merge request pleroma/pleroma!727