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
..
130909091918_twurn.com_.png	new version	2013-09-12 10:41:15 +08:00
130909102300_twurn.com_.png	new version	2013-09-12 10:41:15 +08:00
130909102607_48a3823e1ee72a1a06a62cbdcb4a5cd0.txt	new version	2013-09-12 10:41:15 +08:00
130913110338_YodaoDict.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913112844_YodaoDict.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913150242_YodaoDict.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913150350_89d0a4acf8770fc08309561559c49b62.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913152235_XMP.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913152553_d53d97d93a897698e1b597ba567568fe.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913152811_XMP.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913205349_XMP.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913211043_d53d97d93a897698e1b597ba567568fe.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913211313_navicat.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913214441_89d0a4acf8770fc08309561559c49b62.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913214715_navicat.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130913214952_YodaoDict.exe	添加了提交作业	2013-09-13 21:52:24 +08:00
130916200529_heart.svg	新增需求结束方式	2013-09-23 20:19:42 +08:00