Merge branch 'master' of github.com:coralproject/talk into moderate-bio

Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
This commit is contained in:
David Jay
2017-01-25 17:15:12 -05:00
212 changed files with 5589 additions and 3845 deletions
+1 -1
View File
@@ -924,7 +924,7 @@ definitions:
type: array
items:
type: string
description: Roles occupied by the user (e.g. 'admin', 'moderator', etc.)
description: Roles occupied by the user (e.g. 'ADMIN', 'MODERATOR', etc.)
status:
type: string
description: The current status of the user in the system.