alan 38da932f4c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh ... Conflicts: config/application.rb		2015-01-23 14:57:09 +08:00
..
assets	龚乐鑫修改意见1：去除无用文件	2014-10-15 09:21:51 +08:00
controllers	问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示	2015-01-23 14:25:29 +08:00
helpers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-22 17:51:11 +08:00
models	修改《news，forum模块发送邮件的模板》	2015-01-23 14:51:11 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh	2015-01-23 14:57:09 +08:00