zhuhao 965703a80e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: .rspec		2015-01-23 10:21:26 +08:00
..
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-23 10:21:26 +08:00
spec_helper.rb	user模型数据验证测试	2015-01-23 10:16:46 +08:00