Merge branch 'develop' of ssh://gitlab.howzhi.net:4422/edusoho/edusoho into develop
fix
update js version
Merge branch 'release/3.5.0'
user-import
Merge branch 'develop' of http://gitlab.howzhi.net/edusoho/edusoho into develop
#3572
Merge branch 'develop' of http://gitlab.howzhi.net/edusoho/edusoho into develop
#3572
user-import
Merge branch 'develop' of http://gitlab.howzhi.net/edusoho/edusoho into develop
contact float UI
Merge branch 'develop' of ssh://gitlab.howzhi.net:4422/edusoho/edusoho into develop
user-import
Merge branch 'develop' of http://gitlab.howzhi.net/edusoho/edusoho into develop
user-import
contac float UI
Merge branch 'develop' of ssh://gitlab.howzhi.net:4422/edusoho/edusoho into develop
fix 3534
Merge branch 'develop' of http://gitlab.howzhi.net/edusoho/edusoho into develop