LimeSurvey: questionobject_prototype1 a168728f

Author Committer Branch Timestamp Parent
ollehar1 ollehar1 questionobject_prototype1 2016-10-16 22:58 questionobject_prototype1 6142e67e
Changeset

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

mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/survey/questions/list_dropdown/answer.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/de-informal/de-informal.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - scripts/array-totalsum.js Diff File
mod - scripts/expressions/em_javascript.js Diff File