LimeSurvey: cint e63e2aed

Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-07-21 09:03:01 cint 3afd75cf
Changeset

Merge branch 'master' into cint

mod - .gitignore Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - scripts/admin/tokens.js Diff File
add - scripts/deactivatedebug.js Diff File