diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-09 12:18:44 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-09 12:18:44 +0000 |
| commit | 5e1d994785d4a262f5f328d4a40fcbd080b49075 (patch) | |
| tree | 237a0c5fefbac284ed85a36210dbaa6e290ed162 /priv/static/packs/flavours/vanilla/settings.js | |
| parent | c962c6afb3b30eb6d42c2a5548898b3713492169 (diff) | |
| parent | b6d1bcc55d40b7ac03fdc2f7d4d94ab7c2a1855a (diff) | |
| download | pleroma-5e1d994785d4a262f5f328d4a40fcbd080b49075.tar.gz pleroma-5e1d994785d4a262f5f328d4a40fcbd080b49075.zip | |
Merge branch 'fix/eldap-otp' into 'develop'
include eldap in OTP releases
Closes #1313
See merge request pleroma/pleroma!2501
Diffstat (limited to 'priv/static/packs/flavours/vanilla/settings.js')
0 files changed, 0 insertions, 0 deletions