LimeSurvey: develop 353ba03c
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-12-19 17:18 | develop b6a66b5d |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/controllers/admin/globalsettings.php | Diff File | |||
| mod - application/controllers/admin/surveyadmin.php | Diff File | |||
| mod - application/controllers/admin/useraction.php | Diff File | |||
| mod - application/core/LSYii_ImageValidator.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/admin/activate_helper.php | Diff File | |||
| mod - application/helpers/admin/import_helper.php | Diff File | |||
| mod - application/helpers/admin/statistics_helper.php | Diff File | |||
| mod - application/helpers/export_helper.php | Diff File | |||
| mod - application/helpers/userstatistics_helper.php | Diff File | |||
| add - assets/fonts/fireflysung - Chinese.ttf.txt | Diff File | |||
| rm - assets/fonts/font-src/DejaVuSans - CREDITS | Diff | |||
| rm - assets/fonts/font-src/DejaVuSans.ttf | Diff | |||
| rm - assets/fonts/font-src/fireflysung - Chinese.ttf.txt | Diff | |||
| mod - themes/survey/vanilla/views/layout_printanswers.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/printanswers.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/submit.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/submit_preview.twig | Diff File | |||
