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
..
javascripts	Merge branch 'hjq_beidou' into develop	9 years ago
stylesheets	Merge branch 'hjq_beidou' into develop	9 years ago