LimeSurvey: develop 39a80ed4

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2017-01-16 13:44:15 develop 27caddda
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/helpers/update/updatedb_helper.php
application/libraries/Load_answers.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
rm - scripts/admin/attributeControl.js Diff File
rm - scripts/admin/participantdisplay.js Diff File
mod - styles/Apple_Blossom/css/fonts.css Diff File
mod - third_party/kcfinder/conf/upload.htaccess Diff File