Merge branch 'fix/config-md-typos' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 10 Dec 2018 19:06:13 +0000 (19:06 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 10 Dec 2018 19:06:13 +0000 (19:06 +0000)
commit729321ad20c7c4996b10ac86362a49f6d4cf0841
tree7feabd51f1dabbc6f6b852ff753f8ed8888c7717
parentff10b9927b11bbf42d623fd5cb18039d0db9aa3f
parent100a06afe1151cad880a611dfa48700d2aaf8f6a
Merge branch 'fix/config-md-typos' into 'develop'

config.md: Fix typos and add  `federating` option description

See merge request pleroma/pleroma!525
config/config.md