daiao 911a769670 Merge branch 'develop' into dev_shcool ... Conflicts: app/models/applied_message.rb		2016-07-29 22:05:56 +08:00
..
assets	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-07-29 22:03:45 +08:00
help	…
images	Merge branch 'rep_quality' into cxt_course	2016-07-29 14:36:18 +08:00
javascripts	Merge branch 'develop' into dev_shcool	2016-07-29 22:05:56 +08:00
plugin_assets	pull	2016-06-15 14:17:31 +08:00
statistics/trustie2	Signed-off-by: alan <547533434@qq.com>	2014-10-21 15:13:18 +08:00
stylesheets	Merge branch 'develop' into dev_shcool	2016-07-29 22:05:56 +08:00
themes	学校修改界面修改	2015-10-19 15:51:27 +08:00
404.html	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
500.html	…
Trustie_Beta1.0.0_201412310917.apk	for update	2015-01-04 11:53:16 +08:00
app.html	api路径更改	2016-04-20 17:04:59 +08:00
dispatch.fcgi.example	…
favicon.ico	…
favicon.old.ico	…
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	…
no_file_found.html	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00