alan ee18ba7051 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh ... Conflicts: app/views/boards/_course_show.html.erb app/views/boards/_project_show.html.erb Signed-off-by: alan <547533434@qq.com>		2015-05-11 16:25:17 +08:00
..
assets/kindeditor	编辑器支持直接粘贴QQ截屏	2015-05-06 23:32:34 +08:00
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	课程作品列表界面增加返回顶部功能	2015-05-07 10:43:23 +08:00
javascripts	编辑课程讨论区回复时的问题	2015-05-08 16:14:46 +08:00
plugin_assets	在gemfile中添加rspec	2015-01-20 16:56:23 +08:00
statistics/trustie2	move 2013.8.29	2013-08-30 09:34:21 +08:00
stylesheets	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-05-11 16:25:17 +08:00
themes	去掉首页底部留白和不对齐	2015-04-23 17:43:10 +08:00
404.html	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
500.html	new version	2013-09-12 10:41:15 +08:00
Trustie_Beta1.0.0_201412310917.apk	for update	2015-01-04 11:53:16 +08:00
dispatch.fcgi.example	first commit	2013-08-01 10:33:49 +08:00
favicon.ico	first commit	2013-08-01 10:33:49 +08:00
favicon.old.ico	first commit	2013-08-01 10:33:49 +08:00
file_not_found.html	Signed-off-by: alan <547533434@qq.com>	2014-11-13 10:18:07 +08:00
file_not_found.html.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
htaccess.fcgi.example	first commit	2013-08-01 10:33:49 +08:00
no_file_found.html	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00