You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/controllers/admin_controller.rb db/schema.rb		10 years ago
..
controllers	企业版模块	10 years ago
factories	添加预构件生产测试数据	10 years ago
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	10 years ago
spec_helper.rb	user模型数据验证测试	10 years ago