Bernie Chiu 9b96f2eeb0 Merge ... Conflicts: vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb		2013-10-25 18:21:07 +08:00
..
controllers	Merge	2013-10-25 18:21:07 +08:00
models	Fix encoding issue and add import on title change	2013-10-25 18:05:37 +08:00
views/panel/survey	Fix locale error	2013-10-17 18:23:33 +08:00