huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq ... Conflicts: app/controllers/users_controller.rb public/stylesheets/new_user.css		2015-08-26 15:04:44 +08:00
..
migrate	Merge branch 'sw_new_course' into dev_hjq	2015-08-26 15:04:44 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'sw_new_course' into dev_hjq	2015-08-26 15:04:44 +08:00