LimeSurvey: answers_html 84c13e7e

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html 2016-10-15 10:44:24 answers_html 5b45926c
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html

Conflicts:

scripts/expressions/em_javascript.js

mod - application/controllers/InstallerController.php Diff File
mod - application/models/Token.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - scripts/expressions/em_javascript.js Diff File