LimeSurvey: 2.06lts 6ef3092f

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu 2.06lts 2016-04-27 11:53 2.06lts b87289a2
Changeset

Merge branch '2.06lts' of https://github.com/LimeSurvey/LimeSurvey.git into 2.06_SondagesPro

Conflicts:

application/config/version.php

application/controllers/admin/database.php

application/controllers/admin/surveyadmin.php

application/libraries/Save.php
mod - application/config/version.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - scripts/admin/browse.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/darkblue/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File