huang 17d4e45acc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: app/views/layouts/_logined_header.html.erb		2016-12-30 17:33:18 +08:00
..
assets	Merge branch 'guange_dev' into 'develop'	2016-12-16 16:27:28 +08:00
help	…
images	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-12-30 17:33:18 +08:00
javascripts	竞赛作品的相关设置	2016-12-30 10:30:21 +08:00
plugin_assets	pull	2016-06-15 14:17:31 +08:00
statistics/trustie2	…
stylesheets	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-12-30 17:33:18 +08:00
themes	学校修改界面修改	2015-10-19 15:51:27 +08:00
404.html	点击子域名申请消息报404	2016-11-29 16:22:58 +08:00
500.html	点击子域名申请消息报404	2016-11-29 16:22:58 +08:00
Trustie_Beta1.0.0_201412310917.apk	…
app.html	api路径更改	2016-04-20 17:04:59 +08:00
dispatch.fcgi.example	…
favicon.ico	…
favicon.old.ico	…
file_not_found.html	…
file_not_found.html.erb	…
htaccess.fcgi.example	…
no_file_found.html	…