diff options
author | kaniini <nenolod@gmail.com> | 2019-06-23 05:42:37 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-06-23 05:42:37 +0000 |
commit | 8b7860f12fd9cdf82332fdd8d9ce5696d5e13dd7 (patch) | |
tree | 567fabaf7764681503899ecd46676006cc7084ab /rel | |
parent | 72f365df07e2eba75d3339629b01e5a8913513e6 (diff) | |
parent | b37ede5df349ce70bca7a51ab1da7e22d262bdfe (diff) | |
download | pleroma-8b7860f12fd9cdf82332fdd8d9ce5696d5e13dd7.tar.gz |
Merge branch 'admin-config' into 'develop'
Admin config
See merge request pleroma/pleroma!1328
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions