Merge branch 'feature/support_for_custom' into develop
userlevel fix
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
fix bug
update changlog
管理员同时是学生的时候，当课程过期 依然会提示还有0分钟
Merge branch 'master' of ssh://gitlab.howzhi.net:3322/edusoho/edusoho
d
some modify
批量上传文件，点击边上modal消失的bug
fix bug
Merge branch 'master' of ssh://gitlab.howzhi.net:3322/edusoho/edusoho
d
add changelog
modify changelog
Merge branch 'master' of ssh://gitlab.howzhi.net:3322/edusoho/edusoho
Merge branch 'master' into experiment/GrindPlayer