zhuhao 965703a80e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: .rspec		2015-01-23 10:21:26 +08:00
..
forum_observer_spec.rb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	2015-01-22 16:30:21 +08:00
memo_observer_spec.rb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	2015-01-22 16:30:21 +08:00
user_spec.rb	user模型数据验证测试	2015-01-23 10:16:46 +08:00