Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 25 Mar 2019 02:25:59 +0000 (02:25 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 25 Mar 2019 02:25:59 +0000 (02:25 +0000)
commitbc14c98de115d8695d3436d1f093f4c161ceb3b2
tree0b1a2fe30482f3463a866cfbd23b1198573a0654
parent63ffa4842ca475ed0bd2c2bc2b124889ebdc6d4b
parent6c96d68f7715b7ce8f55ad7c880abeeabc2567d8
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'

add overriding truncated_namespace condition for truncating paths for digital ocean

See merge request pleroma/pleroma!969