Merge branch 'fix-dokku' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 10:15:18 +0000 (10:15 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 10:15:18 +0000 (10:15 +0000)
commitd33d248b69c77a7ab712cfe4b727c0000a77f4ea
treee8fce15cf3a9b93d2613064652b7c56c49767402
parent314758c25bbc0044afcec98710c36532a1dc7e0d
parent9ded9443a3551360991dfa28ced07502037c4559
Merge branch 'fix-dokku' into 'develop'

Fix dokku

See merge request pleroma/pleroma!1236