ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq ... Conflicts: app/controllers/organizations_controller.rb app/views/layouts/_footer.html.erb app/views/layouts/base_org.html.erb app/views/organizations/_org_activities.html.erb db/schema.rb public/stylesheets/new_user.css public/stylesheets/org.css public/stylesheets/public.css		2015-12-28 15:32:03 +08:00
..
migrate	Merge branch 'develop' into dev_hjq	2015-12-28 15:32:03 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	删除不存在的留言动态	2015-12-25 10:13:29 +08:00