LimeSurvey: develop 73d669ea

Diff Back to Repository
Author Committer Branch Timestamp Parent
markusfluer markusfluer develop 2017-07-20 15:46:24 develop 2c4ee89f
Changeset

Merge branch 'master'

Conflicts:
application/config/version.php
application/controllers/admin/database.php
application/views/admin/survey/subview/accordion/_notification_panel.php
docs/release_notes.txt
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/plugins/QuickMenu/QuickMenu.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es-MX/es-MX.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/nn/nn.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/sl/sl.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File