z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/controllers/admin_controller.rb db/schema.rb		2015-03-06 15:36:47 +08:00
..
controllers	企业版模块	2015-01-30 14:11:35 +08:00
factories	添加预构件生产测试数据	2015-01-24 10:36:19 +08:00
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-06 15:36:47 +08:00
spec_helper.rb	user模型数据验证测试	2015-01-23 10:16:46 +08:00