LimeSurvey: answers_html ada5d2f8

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html 2016-10-14 10:55:08 answers_html cc3775f1
Changeset

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

Conflicts:

application/config/version.php

mod - application/config/version.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/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File