yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange ... Conflicts: db/schema.rb public/assets/wechat/homework_detail.html public/javascripts/wechat/controllers/activity.js		2016-07-28 15:23:12 +08:00
..
assets	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-07-28 15:23:12 +08:00
help	…
images	Merge branch 'cxt_course' into develop	2016-07-22 16:46:01 +08:00
javascripts	git pull后重新commit	2016-07-28 15:11:04 +08:00
plugin_assets	pull	2016-06-15 14:17:31 +08:00
statistics/trustie2	…
stylesheets	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-07-28 15:23:12 +08:00
themes	学校修改界面修改	2015-10-19 15:51:27 +08:00
404.html	…
500.html	…
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	…