Commit 14f73c6d by xiexiaoqin

Merge branch 'release/2.0.0' of…

Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0

# Conflicts:
#	config.js
parents cf6472c9 01d8e264
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment