LimeSurvey: answers_html 316359f5

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html 2016-10-28 01:25 answers_html 00d92f5f
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html

Conflicts:

application/config/version.php

templates/news_paper/views/save.pstpl

templates/ubuntu_orange/views/save.pstpl
mod - application/config/version.php Diff File
mod - application/libraries/Date_Time_Converter.php Diff File
mod - application/models/Participant.php Diff File
mod - application/views/admin/participants/displayParticipants_view.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/es/es.mo Diff File
mod - locale/fi/fi.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/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - templates/default/views/save.pstpl Diff File