Add Combined Reporting docs link and description to Home page authored by Jake Beamish's avatar Jake Beamish
......@@ -10,11 +10,15 @@ Apps and services the Community Working Group uses to work collaboratively.
The [Code of Conduct](code-of-conduct) lists the terms a user agrees to when joining social.coop.
### [Reporting Guide](reporting-guide)
### [Combined Reporting Docs](combined-reporting-docs)
This document merges the [reporting-guide](#reporting-guide) and the [Conflict Resolution Guidelines](#conflict-resolution-guidelines).
#### [Reporting Guide](reporting-guide)
The [Reporting Guide](reporting-guide) details methods by which conflict regarding [Code of Conduct](code-of-conduct) infractions can be resolved.
### [Conflict Resolution Guidelines](Conflict-Resolution-Guidelines)
#### [Conflict Resolution Guidelines](Conflict-Resolution-Guidelines)
The [Conflict Resolution Guidelines](Conflict-Resolution-Guidelines) are meant to provide an alternative or preliminary step to the more formal process described in the Reporting Guidelines.
......
......