sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/models/user.rb app/views/courses/_course_form.html.erb db/schema.rb		2014-11-08 16:40:36 +08:00
..
migrate	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-11-08 16:40:36 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	1、用户名过长的显示问题。2、部分内容过长的回复的与头像不在同一行问题	2014-11-06 14:51:25 +08:00