LimeSurvey: develop 91fdd1c6

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-09-26 08:44:20 develop e3a7a115
Changeset

Dev: Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: Oups … don't squash and merge …

Conflicts:

application/views/admin/token/tokenform.php

add - application/third_party/pear/OLE/PPS/System.php Diff File
mod - application/views/admin/token/tokenform.php Diff File