alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/helpers/projects_helper.rb app/views/contest_notification/show.html.erb Signed-off-by: alan <547533434@qq.com>		2014-09-15 10:58:14 +08:00
..
_form.html.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00
_forum_list.html.erb	公共贴吧描述显示有html代码的BUG #1215	2014-09-10 15:19:34 +08:00
_show_topics.html.erb	竞赛、课程主页贴吧动态及贴吧内帖子列表添加最后回复人	2014-05-21 18:52:15 +08:00
edit.html.erb	...	2013-12-16 19:36:50 +08:00
index.html.erb	网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复	2014-07-18 16:39:39 +08:00
new.html.erb	1.修改新建帖子的长度上限设置，设置为2G	2014-08-14 14:38:18 +08:00
show.html.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +08:00