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		2016-05-06 10:16:56 +08:00
..
javascripts	Merge branch 'hjq_beidou' into develop	2016-05-06 10:16:56 +08:00
stylesheets	Merge branch 'hjq_beidou' into develop	2016-05-06 10:16:56 +08:00