LimeSurvey: develop ba30a82a
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-10-02 18:01 | develop 4030c2df |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/config/config-defaults.php | Diff File | |||
| mod - application/controllers/admin/index.php | Diff File | |||
| mod - application/libraries/PluginManager/PluginManager.php | Diff File | |||
| mod - application/models/Survey.php | Diff File | |||
| mod - application/models/SurveyDynamic.php | Diff File | |||
| mod - application/views/survey/questions/question_help/em-tip.php | Diff File | |||
| mod - assets/packages/pjax/min/pjax.combined.min.js | Diff File | |||
| mod - assets/packages/pjax/min/pjax.min.js | Diff File | |||
| mod - assets/packages/pjax/pjax.js | Diff File | |||
