xianbo 7da2f421e0 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: app/views/bids/_new.html.erb app/views/projects/feedback.html.erb		2013-11-08 15:50:28 +08:00
..
assets	new version	2013-09-12 10:41:15 +08:00
controllers	modify shoew of project	2013-11-07 17:04:37 +08:00
helpers	modify show of some style	2013-11-08 15:49:08 +08:00
models	优化用户搜索	2013-11-08 11:01:28 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-11-08 15:50:28 +08:00