huang 59ebadd406 Merge branch 'cxt_course' into develop ... Conflicts: app/views/layouts/_user_courses.html.erb		2016-09-09 17:25:51 +08:00
..
assets	修改管理课程文字提示	2016-09-09 17:09:02 +08:00
help	…
images	课程列表icon缩小	2016-09-01 14:04:53 +08:00
javascripts	Merge branch 'weixin_guange' into develop	2016-09-09 16:05:32 +08:00
plugin_assets	pull	2016-06-15 14:17:31 +08:00
statistics/trustie2	…
stylesheets	侧导航箭头显示	2016-09-09 16:48:43 +08:00
themes	学校修改界面修改	2015-10-19 15:51:27 +08:00
404.html	…
500.html	…
Trustie_Beta1.0.0_201412310917.apk	…
app.html	api路径更改	2016-04-20 17:04:59 +08:00
dispatch.fcgi.example	…
favicon.ico	…
favicon.old.ico	…
file_not_found.html	…
file_not_found.html.erb	…
htaccess.fcgi.example	…
no_file_found.html	…