Merge branch 'configurable-federator' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 1 Jan 2019 18:55:59 +0000 (18:55 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 1 Jan 2019 18:55:59 +0000 (18:55 +0000)
commit34fa7090158315eb0c8304c6b496f23338f9e1c6
tree88de8bfc58027aeffa58f578b224d0517b004f1f
parentb9ac7067ebef902be937de3889b8a62cbf1de9da
parent1a0391c8a474c282823d3b2ab7a0cae62328c5b3
Merge branch 'configurable-federator' into 'develop'

Make Federator options configurable.

See merge request pleroma/pleroma!615