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.

sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh ... Conflicts: app/views/projects/show.html.erb db/schema.rb		11 years ago
..
forge_activity_spec.rb	项目动态重写，并去掉首页缓存	11 years ago
forum_observer_spec.rb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	11 years ago
memo_observer_spec.rb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	11 years ago
organization_spec.rb	1、增加组织相关数据表	11 years ago
user_spec.rb	返回匿名和用户全名方法测试	11 years ago