LimeSurvey: master 91e54f3c

Author Committer Branch Timestamp Parent
ollehar ollehar master 2016-02-18 15:20 master b30d8738
Changeset

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

mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/survey/Question/listquestions.php Diff File
mod - application/views/admin/survey/QuestionGroups/listquestiongroups.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/usergroup/usergroups_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
add - scripts/bootstrap-for-template-editor.js Diff File
add - styles-public/bootstrap-for-template-editor.css Diff File