LimeSurvey: develop f3f41faf
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| DenisChenu | DenisChenu | develop | 2018-10-15 21:08 | develop 09af20fd |
| Changeset | Merge branch 'develop' of github.com:LimeSurvey/LimeSurvey into develop Conflicts:application/helpers/questionHelper.php |
|||
| mod - application/controllers/PluginsController.php | Diff File | |||
| mod - application/controllers/admin/themeoptions.php | Diff File | |||
| mod - application/helpers/questionHelper.php | Diff File | |||
| mod - application/models/TemplateConfiguration.php | Diff File | |||
| mod - application/views/admin/themeoptions/update.php | Diff File | |||
| mod - themes/survey/bootswatch/options/options.js | Diff File | |||
| mod - themes/survey/bootswatch/options/options.twig | Diff File | |||
| mod - themes/survey/fruity/options/options.js | Diff File | |||
| mod - themes/survey/fruity/options/options.twig | Diff File | |||
| mod - themes/survey/vanilla/options/options.js | Diff File | |||
| mod - themes/survey/vanilla/options/options.twig | Diff File | |||
