diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 16:38:27 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 16:38:27 +0000 |
| commit | c7d69e925664ce7125c3938c298d72e94a2a1349 (patch) | |
| tree | 717028080c5c6a84b0362e67e86aa8a51b2c005b /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | |
| parent | b7f297f0bd214416f3faded4a6221899b68edabd (diff) | |
| parent | 9a82de219c264f467b485316570c5425e3fe2f00 (diff) | |
| download | pleroma-c7d69e925664ce7125c3938c298d72e94a2a1349.tar.gz | |
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/admin_api_controller.ex')
0 files changed, 0 insertions, 0 deletions