Merge branch 'improve-server-config-examples' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:55:01 +0000 (23:55 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:55:01 +0000 (23:55 +0000)
commitb0ec4f33e661cb14730a622d64dbc721e2723825
tree9f52b88d4f0bc563305a7b4ebe92a4a81c5574f5
parent3e4f39116be3ac6954d643ee7b2f4b2c05625e91
parent8a4e2f48bfd2fec64eeebbeb7f05f80d23e9bd47
Merge branch 'improve-server-config-examples' into 'develop'

Improve server config examples

See merge request pleroma/pleroma!307