ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq ... Conflicts: app/controllers/organizations_controller.rb config/routes.rb db/schema.rb public/images/hwork_icon.png public/stylesheets/new_user.css public/stylesheets/public.css		2016-01-06 16:27:42 +08:00
..
migrate	Merge branch 'szzh' into dev_hjq	2016-01-06 16:27:42 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	1.增加项目/课程快捷功能；	2016-01-06 16:22:13 +08:00