LimeSurvey: develop 0f8a3ab9

Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-04-11 17:58 develop f052d6a9
Changeset

Merge branch 'master' into develop

Conflicts:
application/core/LSETwigViewRenderer.php

mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/answer/date/selector/answer.twig Diff File
mod - assets/packages/expressions/em_javascript.js Diff File
mod - themes/survey/vanilla/views/subviews/navigation/navigator.twig Diff File