Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

# Conflicts: # public/react/src/AppConfig.js
6 years ago · 3c64fc3066
parent a0be920068
commit 3c64fc3066
1 changed files with 1 additions and 1 deletions
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@ -39,7 +39,7 @@ class PollNew extends Component {
 			visible: false,
 			poll_questions: [],
 			user_permission: "",
-			addonAfter: 60,
+			addonAfter: 0,
 			addonAftertwo: 100,
 			mysingles: 0,
 			mydoubles: 0,