LimeSurvey: master 25dcd4ce

Author Committer Branch Timestamp Parent
ollehar ollehar master 2016-02-12 10:50:22 master 7cb604e8
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/views/admin/participants/attributeMapCSV_view.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - locale/_template/limesurvey.pot Diff File