Kim Gardner 9fc0fc37db Fix merge conflicts

2017-10-23 19:30:36 +01:00

..

01-01-talk-quickstart.md

updated docs

2017-10-11 15:32:25 -06:00

01-02-installation-from-docker.md

updated docs

2017-10-11 15:32:25 -06:00

01-03-installation-from-source.md

updated docs

2017-10-11 15:32:25 -06:00

02-01-required-configuration.md

Reorganize file order and reinstate h2s

2017-10-13 15:50:13 +01:00

02-02-advanced-configuration.md

Reorganize file order and reinstate h2s

2017-10-13 15:50:13 +01:00

03-01-product-guide-how-talk-works.md

Reorganize file order and reinstate h2s

2017-10-13 15:50:13 +01:00

03-02-product-guide-commenter-features.md

Fix merge conflicts

2017-10-23 19:30:36 +01:00

03-03-product-guide-moderator-features.md

formatting

2017-10-20 13:14:00 -06:00

03-04-product-guide-trust.md

Fix styling

2017-10-17 10:28:56 +01:00

03-05-product-guide-toxic-comments.md

Fix styling

2017-10-17 10:28:56 +01:00

03-06-product-guide-configuring-talk.md

formatting

2017-10-20 13:14:00 -06:00

04-01-plugins-overview.md

Reorganize file order and reinstate h2s

2017-10-13 15:50:13 +01:00

04-02-default-plugins.md

Fixed incorrect plugin naming

2017-10-20 11:40:55 -06:00

04-03-additional-plugins.md

Reorganize file order and reinstate h2s

2017-10-13 15:50:13 +01:00

04-04-plugin-recipes.md

Reorganize file order and reinstate h2s

2017-10-13 15:50:13 +01:00

05-01-faq.md

formatting

2017-10-20 13:14:00 -06:00