huang 2b0775da26 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll ... Conflicts: db/schema.rb		2015-01-14 16:37:45 +08:00
..
migrate	问卷显示	2015-01-14 11:50:59 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll	2015-01-14 16:37:45 +08:00