5 Commits

Author	SHA1	Message	Date
fanqiang	1781d3ba8d	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: app/views/layouts/base_bids.html.erb	2013-08-01 20:59:29 +08:00
huangjingquan	bf1f9b8e19	remove .bundle from ignored file list	2013-08-01 11:08:59 +08:00
huangjingquan	eb2fce200d	add test/* and tmp/* to ignore files list	2013-08-01 10:51:53 +08:00
huangjingquan	36686d6cf3	modify the .gitignote file	2013-08-01 10:47:41 +08:00
huangjingquan	70b211e355	first commit	2013-08-01 10:33:49 +08:00