z9hang 8dab2057a9 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll ... Conflicts: config/routes.rb		2015-01-15 09:42:41 +08:00
..
assets	龚乐鑫修改意见1：去除无用文件	2014-10-15 09:21:51 +08:00
controllers	Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll	2015-01-15 09:42:41 +08:00
helpers	答题相关方法添加	2015-01-15 09:41:19 +08:00
models	问卷显示	2015-01-14 11:50:59 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll	2015-01-15 09:42:41 +08:00