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
..
redmine_ckeditor	Signed-off-by: alanlong9278 <547533434@qq.com>	2015-04-15 12:30:37 +08:00
redmine_code_review	项目界面缺失翻译调整	2015-04-10 16:59:45 +08:00