lizanle 3637d1906d Merge branch 'szzh' into dev_zanle ... Conflicts: Gemfile config/routes.rb		2015-01-28 12:38:32 +08:00
..
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	修改问题反馈弹框！	2015-01-22 17:46:12 +08:00
javascripts	Merge branch 'szzh' into dev_zanle	2015-01-23 10:33:07 +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' into dev_zanle	2015-01-27 14:46:04 +08:00
themes	修改修改资料处样式问题	2015-01-17 11:51:59 +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