LimeSurvey: develop 0835d093

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2017-01-06 12:17 develop 07cbcc11
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/helpers/expressions/em_core_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/qanda_helper.php
mod - application/config/version.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/helpers/admin/activate_helper.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/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Participant.php Diff File
add - application/third_party/phpmailer/.gitattributes Diff File
mod - application/third_party/phpmailer/.travis.yml Diff File
mod - application/third_party/phpmailer/README.md Diff File
add - application/third_party/phpmailer/SECURITY.md Diff File
mod - application/third_party/phpmailer/VERSION Diff File
mod - application/third_party/phpmailer/changelog.md Diff File
mod - application/third_party/phpmailer/class.phpmailer.php Diff File
mod - application/third_party/phpmailer/class.phpmaileroauth.php Diff File
mod - application/third_party/phpmailer/class.pop3.php Diff File
mod - application/third_party/phpmailer/class.smtp.php Diff File
mod - application/third_party/phpmailer/composer.lock Diff File
mod - application/third_party/phpmailer/extras/htmlfilter.php Diff File
mod - application/third_party/phpmailer/extras/ntlm_sasl_client.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-de.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-es.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ro.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/en/en.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/he/he.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ky/ky.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/prs/prs.mo Diff File
mod - locale/pt-BR/pt-BR.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File