LimeSurvey: develop b4ecd3bb

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-04-19 12:22:55 develop 2659cdae
Changeset

Merge branch 'master' into develop

Conflicts:
application/libraries/PluginManager/LimesurveyApi.php
mod - .travis.yml Diff File