LimeSurvey: develop e5f6fa82
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| DenisChenu | DenisChenu | develop | 2016-12-08 18:55:50 | develop 9811bd71 |
| Changeset | Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop Conflicts:application/controllers/admin/templates.php |
|||
| mod - application/config/config-defaults.php | Diff File | |||
| mod - application/controllers/admin/templates.php | Diff File | |||
| mod - application/controllers/admin/update.php | Diff File | |||
| mod - application/views/admin/update/manage/manage_key.php | Diff File | |||
| mod - application/views/admin/update/updater/welcome/_welcome.php | Diff File | |||
