daiao 289ff1a329 Merge branch 'dev_daiao' into develop ... Conflicts: app/views/users/_my_homepage_shixuns_list.html.erb		2017-06-30 09:54:09 +08:00
..
_content_list.html.erb	学员访问实训TPM时，已经挑战完的关卡，是否应该标识出来	2017-06-27 16:23:31 +08:00
_form.html.erb	关卡的新建和编辑页，过关任务输入框的高度调整	2017-06-23 11:06:26 +08:00
edit.html.erb	编辑关卡时,显示当前关卡是第几关	2017-05-08 15:36:33 +08:00
index.html.erb	实训流程	2017-06-23 10:38:40 +08:00
index_down.js.erb	first commit	2017-04-07 10:16:13 +08:00
index_up.js.erb	first commit	2017-04-07 10:16:13 +08:00
new.html.erb	修改game访问权限	2017-04-21 15:57:08 +08:00
show.html.erb	超级管理员的审批菜单下各页面的tab样式请换一下	2017-06-29 09:35:55 +08:00