cxt 099fcde246 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb		2017-02-24 15:20:34 +08:00
..
assets	竞赛基本信息页面的“竞赛介绍”的默认提示信息丢失了	2017-02-09 09:45:46 +08:00
help	…
images	合作伙伴图片 及项目管理脚本录入界面	2017-02-19 15:28:57 +08:00
javascripts	竞赛：改了提交截止日期，显示的还是提交已截止	2017-02-24 14:29:41 +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	2017-02-24 15:20:34 +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	…