Merge branch 'fix/eldap-otp' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 9 May 2020 12:18:44 +0000 (12:18 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 9 May 2020 12:18:44 +0000 (12:18 +0000)
commit5e1d994785d4a262f5f328d4a40fcbd080b49075
tree237a0c5fefbac284ed85a36210dbaa6e290ed162
parentc962c6afb3b30eb6d42c2a5548898b3713492169
parentb6d1bcc55d40b7ac03fdc2f7d4d94ab7c2a1855a
Merge branch 'fix/eldap-otp' into 'develop'

include eldap in OTP releases

Closes #1313

See merge request pleroma/pleroma!2501