LimeSurvey: develop c9213dd7
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| DenisChenu | DenisChenu | develop | 2016-12-20 20:13 | develop 99bdf08b |
| Changeset | Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop Conflicts:application/views/survey/questions/multipleshorttext/rows/answer_row_textarea.php |
|||
| mod - application/commands/PluginCommand.php | Diff File | |||
| mod - application/controllers/admin/responses.php | Diff File | |||
| mod - application/controllers/admin/templates.php | Diff File | |||
| mod - application/controllers/admin/tokens.php | Diff File | |||
| mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | |||
| mod - application/views/admin/token/addtokenpost.php | Diff File | |||
| mod - scripts/admin/tokens.js | Diff File | |||
