cxt cbb6b2175f Merge branch 'dev_xucheng' into develop ... Conflicts: public/javascripts/edu/edu_tpi.js public/stylesheets/css/edu-public.css		2017-09-06 10:52:47 +08:00
..
api/mobile	first commit	2017-04-07 10:16:13 +08:00
assets	Merge branch 'develop' into dev_kubernete	2017-08-04 20:42:16 +08:00
controllers	Merge branch 'dev_xucheng' into develop	2017-09-06 10:52:47 +08:00
helpers	实训作业列表的调整	2017-09-05 17:04:41 +08:00
models	切换分支	2017-09-06 09:28:01 +08:00
services	新建课堂修删除专业等信息，简洁化	2017-08-29 17:31:28 +08:00
sweepers	first commit	2017-04-07 10:16:13 +08:00
tasks	first commit	2017-04-07 10:16:13 +08:00
views	Merge branch 'dev_xucheng' into develop	2017-09-06 10:52:47 +08:00