Commit Graph

4 Commits

Author SHA1 Message Date
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
	db/schema.rb
2016-01-29 15:44:26 +08:00
guange d8ef2f0965 个人留言中的at启用 2016-01-26 18:24:15 +08:00
cxt bbdced9bc1 留言页面的样式修改 2016-01-22 21:41:17 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00