daiao 0591440c9e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: app/controllers/users_controller.rb app/views/users/_user_message_forge.html.erb db/schema.rb		2017-01-13 11:28:33 +08:00
..
assets	微信at列表显示问题	2017-01-06 21:48:04 +08:00
help	…
images	竞赛图片上传	2017-01-06 15:03:01 +08:00
javascripts	Merge branch 'develop' into 'develop'	2017-01-13 11:24:07 +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-01-13 11:28:33 +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	…