alanlong9278 b704555628 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh ... Conflicts: .gitignore Gemfile app/controllers/discuss_demos_controller.rb app/models/user.rb app/views/bids/_bid_homework_show.html.erb app/views/issues/index.html.erb app/views/layouts/_base_feedback.html.erb app/views/poll/publish_poll.js.erb app/views/poll/republish_poll.js.erb public/javascripts/application.js Signed-off-by: alanlong9278 <547533434@qq.com>		2015-04-15 12:36:19 +08:00
..
api/mobile	添加判空	2015-04-15 10:52:10 +08:00
assets	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 14:27:56 +08:00
controllers	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-04-15 12:36:19 +08:00
helpers	课程成员搜索忽略大小写	2015-04-14 15:16:58 +08:00
models	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-04-15 12:36:19 +08:00
services	current_user判空	2015-04-15 10:30:56 +08:00
sweepers	…
views	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-04-15 12:36:19 +08:00