huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course ... Conflicts: app/views/users/_course_message.html.erb app/views/users/_project_issue.html.erb db/schema.rb		2016-01-21 16:10:29 +08:00
..
migrate	Merge branch 'develop' into hjq_new_course	2016-01-21 16:10:29 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'develop' into hjq_new_course	2016-01-21 16:10:29 +08:00