yuanke d6d9a366f2 Merge branch 'develop' into yuanke ... Conflicts: public/stylesheets/new_user.css		2016-06-17 14:36:12 +08:00
..
assets	Merge remote-tracking branch 'origin/develop' into weixin_guange	2016-06-12 17:18:34 +08:00
help	error message: Redmine ==> Trustie	2013-08-12 23:42:39 +08:00
images	登录注册背景图片替换	2016-06-16 17:14:13 +08:00
javascripts	Merge branch 'cxt_course' into develop	2016-06-17 11:33:48 +08:00
plugin_assets	压缩angularjs	2016-06-09 19:48:58 +08:00
statistics/trustie2	Signed-off-by: alan <547533434@qq.com>	2014-10-21 15:13:18 +08:00
stylesheets	Merge branch 'develop' into yuanke	2016-06-17 14:36:12 +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
app.html	api路径更改	2016-04-20 17:04:59 +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