• Carsten Schmitz's avatar
    Merge branch 'master' into 2.06 · b5142e78
    Carsten Schmitz authored
    Conflicts:
    	application/config/internal.php
    	application/controllers/InstallerController.php
    	application/controllers/OptoutController.php
    	application/controllers/admin/checkintegrity.php
    	application/controllers/admin/conditionsaction.php
    	application/controllers/admin/globalsettings.php
    	application/controllers/admin/labels.php
    	application/controllers/admin/participantsaction.php
    	application/controllers/admin/printablesurvey.php
    	application/controllers/admin/surveyadmin.php
    	application/controllers/admin/tokens.php
    	application/controllers/admin/translate.php
    	application/controllers/admin/update.php
    	application/controllers/admin/useraction.php
    	application/extensions/SettingsWidget/SettingsWidget.php
    	application/helpers/admin/import_helper.php
    	application/helpers/common_helper.php
    	application/helpers/expressions/em_manager_helper.php
    	application/helpers/frontend_helper.php
    	application/helpers/qanda_helper.php
    	application/models/Token.php
    	application/models/TokenDynamic.php
    	application/views/admin/checkintegrity/check_view.php
    	application/views/admin/emailtemplates/email_language_template_tab.php
    	application/views/admin/export/exportresults_view.php
    	application/views/admin/labels/labelbar_view.php
    	application/views/admin/labels/labelsetsbar_view.php
    	application/views/admin/labels/labelview_view.php
    	application/views/admin/participants/attributeControl_view.php
    	application/views/admin/participants/displayParticipants_view.php
    	application/views/admin/survey/Question/answerOptions_view.php
    	application/views/admin/survey/Question/subQuestion_view.php
    	application/views/admin/survey/deactivateSurvey_view.php
    	application/views/admin/survey/editSurvey_view.php
    	application/views/admin/survey/subview/tabNotification_view.php
    	application/views/admin/survey/subview/tabTokens_view.php
    	application/views/admin/token/csvpost.php
    	application/views/admin/token/email.php
    	application/views/admin/token/tokenbar.php
    	application/views/admin/token/tokenform.php
    	application/views/admin/token/tokensummary.php
    	application/views/admin/translate/translateformheader_view.php
    	application/views/admin/translate/translatetabs_view.php
    	application/views/installer/dbconfig_view.php
    	application/views/installer/precheck_view.php
    	application/views/surveys/publicSurveyList.php
    	installer/sql/create-mssql.sql
    	locale/_template/limesurvey.pot
    	locale/ar/LC_MESSAGES/ar.mo
    	locale/cs-informal/LC_MESSAGES/cs-informal.mo
    	locale/cs/LC_MESSAGES/cs.mo
    	locale/de-informal/LC_MESSAGES/de-informal.mo
    	locale/de/LC_MESSAGES/de.mo
    	locale/el/LC_MESSAGES/el.mo
    	locale/es-MX/LC_MESSAGES/es-MX.mo
    	locale/es/LC_MESSAGES/es.mo
    	locale/et/LC_MESSAGES/et.mo
    	locale/fi/LC_MESSAGES/fi.mo
    	locale/fr/LC_MESSAGES/fr.mo
    	locale/hr/LC_MESSAGES/hr.mo
    	locale/hu/LC_MESSAGES/hu.mo
    	locale/id/LC_MESSAGES/id.mo
    	locale/it-informal/LC_MESSAGES/it-informal.mo
    	locale/it/LC_MESSAGES/it.mo
    	locale/ja/LC_MESSAGES/ja.mo
    	locale/ka/LC_MESSAGES/ka.mo
    	locale/lt/LC_MESSAGES/lt.mo
    	locale/lv/LC_MESSAGES/lv.mo
    	locale/ms/LC_MESSAGES/ms.mo
    	locale/nb/LC_MESSAGES/nb.mo
    	locale/nl-informal/LC_MESSAGES/nl-informal.mo
    	locale/nl/LC_MESSAGES/nl.mo
    	locale/nn/LC_MESSAGES/nn.mo
    	locale/pl/LC_MESSAGES/pl.mo
    	locale/pt/LC_MESSAGES/pt.mo
    	locale/ru/LC_MESSAGES/ru.mo
    	locale/sv/LC_MESSAGES/sv.mo
    	locale/th/LC_MESSAGES/th.mo
    	locale/tr/LC_MESSAGES/tr.mo
    	locale/uk/LC_MESSAGES/uk.mo
    	locale/zh-Hans/LC_MESSAGES/zh-Hans.mo
    	locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo
    	locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo
    b5142e78
.gitignore 410 Bytes