Merge branch 'answers_html' of https://github.com/tammoterhark/LimeSu… · LimeSurvey/LimeSurvey@999278e · GitHub

Commit

Merge branch 'answers_html' of https://github.com/tammoterhark/LimeSu…

Browse files

…rvey into answers_html

# Conflicts:
#	templates/default/css/ls-functional.css
#	templates/default/css/styling.css
#	templates/default/css/template.css

Loading branch information

Tammo ter Hark committed Oct 27, 2016

2 parents f07ccf0 + 2a7abee commit 999278e