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)
config.md: Fix typos and add  `federating` option description

See merge request pleroma/pleroma!525

1  2 
config/config.md

Simple merge