Merge branch 'feature/mrf-vocabulary' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 13 Aug 2019 22:51:15 +0000 (22:51 +0000)
commit9ef31767f23b908f276c6cbd44b0bd46373f91fe
tree0f71f35b9417f6ec9391ea46d1c5c5e72e53ca6e
parentc3a54cc34daa971153508f269b3e701ca6eb08cd
parent5983f98f2618d5e744337f1f79b78c3ad2774d9c
Merge branch 'feature/mrf-vocabulary' into 'develop'

MRF Vocabulary

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