Merge branch 'feature/mrf-subchain' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 4 Jun 2019 05:49:54 +0000 (05:49 +0000)
commit9f0d0d0805d0417636c3cf7aaf14d15ad13d0148
treebf02fc7b03a8b0119c0ba51208462f39f071fd12
parent59f6e794e1cbc1e5e4d9fd9ff7df23186740f83a
parent7758148990184ac25e097dc7358a918b89aa3ca9
Merge branch 'feature/mrf-subchain' into 'develop'

MRF: subchain policy

See merge request pleroma/pleroma!1233
CHANGELOG.md
config/config.exs
docs/config.md