wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-11 12:51:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source 
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
This commit is contained in:
Riley Davis
2016-12-20 14:51:36 -07:00
parent 8849dcbf5c 9d22dcd0d4
commit 652a41971b
38 changed files with 8018 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/containers/Configure/CommentSettings.js
+1
View File
@@ -71,6 +71,7 @@ const updateClosedTimeout = (updateSettings, ts, isMeasure) => (event) => {
const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError, settings, errors}) => {
if (fetchingSettings) {
/* maybe a spinner here at some point */
return <p>Loading settings...</p>;
}