Merge remote-tracking branch 'remotes/origin/master' into zgl

# Conflicts: # src/gdms/GlobalTimePoint.json
6 years ago · b5ceb5b419
parent 2b37cb7b39
commit b5ceb5b419
1 changed files with 7 additions and 7 deletions
--- a/src/gdms/GlobalTimePoint.json
+++ b/src/gdms/GlobalTimePoint.json
@ -1,9 +1,9 @@
 {
-  "teacher_choose_student_start_date":"";,
-  "student_choose_teacher_start_date": "",;
-  "choose_end_date": "",;
-  "opening_report_opinion_deadline_date": "",;
-  "finished_product_deadline_date": "",;
-  "finished_product_review_deadline_date": "",;
-  "reply_opition_deadline_date": "";
+  "teacher_choose_student_start_date":"",
+  "student_choose_teacher_start_date": "",
+  "choose_end_date": "",
+  "opening_report_opinion_deadline_date": "",
+  "finished_product_deadline_date": "",
+  "finished_product_review_deadline_date": "",
+  "reply_opition_deadline_date": ""
 }