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.

huang 9e0176bc55 Merge branch 'hjq_beidou' into develop ... Conflicts: app/controllers/organizations_controller.rb app/helpers/organizations_helper.rb db/schema.rb public/images/homepage_icon.png public/stylesheets/new_user.css		9 years ago
..
controllers	Merge branch 'hjq_beidou' into develop	9 years ago
factories	Merge branch 'hjq_beidou' into develop	9 years ago
fixtures	头像上传只允许图片	10 years ago
models	Merge branch 'hjq_beidou' into develop	9 years ago
requests	代码重置	9 years ago
support	代码重置	9 years ago
rails_helper.rb	代码重置	9 years ago
seeds.rb	代码重置	9 years ago
shared_account_spec.rb	代码重置	9 years ago
spec_helper.rb	代码重置	9 years ago