trustieforge

Author	SHA1	Message	Date
william	61e4021625	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop Conflicts: app/controllers/bids_controller.rb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb config/locales/zh.yml config/routes.rb lib/redmine.rb	12 years ago
william	006f381a05	新增需求结束方式	12 years ago
fanqiang	805ad6600b	添加了提交作业	12 years ago
huangjingquan	261c3fc337	new version	12 years ago