LimeSurvey: cint 21606075

Author Committer Branch Timestamp Parent
ollehar1 ollehar1 cint 2016-08-12 10:17:13 cint 43f7a00d
Changeset

Merge remote-tracking branch 'origin/master' into cint

mod - application/controllers/admin/useraction.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/User.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File
mod - scripts/admin/users.js Diff File