LimeSurvey: cond 8b183739

Author Committer Branch Timestamp Parent
ollehar ollehar cond 2016-10-10 10:21:13 cond 2cc9b0ae
Changeset

Merge remote-tracking branch 'origin/master' into cond

mod - application/config/version.php Diff File
mod - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/third_party/phpmailer/.gitignore Diff File
mod - application/third_party/phpmailer/README.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.phpmaileroauthgoogle.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.json Diff File
mod - application/third_party/phpmailer/composer.lock Diff File
mod - application/third_party/phpmailer/get_oauth_token.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ka.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ru.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
add - locale/bn/bn.mo Diff File
add - locale/bn/index.html Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/ky/ky.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
add - tmp/assets/index.html Diff File