cxt 25cc959576 Merge branch 'szzh' into develop ... Conflicts: app/views/layouts/_user_courses.html.erb app/views/org_subfields/show.html.erb app/views/organizations/_subfield_list.html.erb app/views/users/_resource_share_for_orgs.html.erb		2016-01-14 18:22:57 +08:00
..
assets	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	针对课程370的精品课程样式设计	2016-01-13 18:33:22 +08:00
javascripts	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-01-14 15:59:50 +08:00
plugin_assets	经测试，转到rspec各方面成熟一点。	2015-05-14 11:41:50 +08:00
statistics/trustie2	Signed-off-by: alan <547533434@qq.com>	2014-10-21 15:13:18 +08:00
stylesheets	Merge branch 'szzh' into develop	2016-01-14 18:22:57 +08:00
themes	学校修改界面修改	2015-10-19 15:51:27 +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