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		2013-09-24 09:52:08 +08:00
..
07	first commit	2013-08-01 10:33:49 +08:00
08	move 2013.8.29	2013-08-30 09:34:21 +08:00
09	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-09-24 09:52:08 +08:00