LimeSurvey: develop 9811bd71
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| DenisChenu | DenisChenu | develop | 2016-12-08 16:57:12 | develop 1f46d1a1 |
| Changeset | Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop Conflicts:application/helpers/frontend_helper.php |
|||
| mod - application/controllers/admin/update.php | Diff File | |||
| mod - application/helpers/frontend_helper.php | Diff File | |||
| mod - application/models/Timing.php | Diff File | |||
| mod - application/views/admin/super/fullpagebar_view.php | Diff File | |||
| add - application/views/admin/update/manage/manage_key.php | Diff File | |||
| add - application/views/admin/update/manage/subscribe.php | Diff File | |||
