merge

LimeSurvey · Jan 9, 2018 · 4aa9560 · 4aa9560
1 parent 42f617d
commit 4aa9560
Show file tree

Hide file tree

Showing 26 changed files with 0 additions and 0 deletions.
diff --git a/tests/functional/admin/AdminViewsTest.php → tests/acceptance/admin/AdminViewsTest.php b/tests/functional/admin/AdminViewsTest.php → tests/acceptance/admin/AdminViewsTest.php
diff --git a/tests/functional/admin/CreateSurveyTest.php → tests/acceptance/admin/CreateSurveyTest.php b/tests/functional/admin/CreateSurveyTest.php → tests/acceptance/admin/CreateSurveyTest.php
diff --git a/...onal/admin/InstallationControllerTest.php → ...ance/admin/InstallationControllerTest.php b/...onal/admin/InstallationControllerTest.php → ...ance/admin/InstallationControllerTest.php
diff --git a/...stions/SaveDualScaleAnswerOptionsTest.php → ...stions/SaveDualScaleAnswerOptionsTest.php b/...stions/SaveDualScaleAnswerOptionsTest.php → ...stions/SaveDualScaleAnswerOptionsTest.php
diff --git a/...s/resources/data/sql/create-mysql.153.sql → tests/resources/sql/create-mysql.153.sql b/...s/resources/data/sql/create-mysql.153.sql → tests/resources/sql/create-mysql.153.sql
diff --git a/...s/resources/data/sql/create-mysql.258.sql → tests/resources/sql/create-mysql.258.sql b/...s/resources/data/sql/create-mysql.258.sql → tests/resources/sql/create-mysql.258.sql
diff --git a/...s/resources/data/sql/create-mysql.315.sql → tests/resources/sql/create-mysql.315.sql b/...s/resources/data/sql/create-mysql.315.sql → tests/resources/sql/create-mysql.315.sql
diff --git a/...data/surveys/limesurvey_survey_186734.lss → ...rces/surveys/limesurvey_survey_186734.lss b/...data/surveys/limesurvey_survey_186734.lss → ...rces/surveys/limesurvey_survey_186734.lss
diff --git a/...data/surveys/limesurvey_survey_352985.lss → ...rces/surveys/limesurvey_survey_352985.lss b/...data/surveys/limesurvey_survey_352985.lss → ...rces/surveys/limesurvey_survey_352985.lss
diff --git a/...data/surveys/limesurvey_survey_366446.lss → ...rces/surveys/limesurvey_survey_366446.lss b/...data/surveys/limesurvey_survey_366446.lss → ...rces/surveys/limesurvey_survey_366446.lss
diff --git a/...data/surveys/limesurvey_survey_454287.lss → ...rces/surveys/limesurvey_survey_454287.lss b/...data/surveys/limesurvey_survey_454287.lss → ...rces/surveys/limesurvey_survey_454287.lss
diff --git a/...data/surveys/limesurvey_survey_563168.lss → ...rces/surveys/limesurvey_survey_563168.lss b/...data/surveys/limesurvey_survey_563168.lss → ...rces/surveys/limesurvey_survey_563168.lss
diff --git a/...data/surveys/limesurvey_survey_583999.lss → ...rces/surveys/limesurvey_survey_583999.lss b/...data/surveys/limesurvey_survey_583999.lss → ...rces/surveys/limesurvey_survey_583999.lss
diff --git a/...data/surveys/limesurvey_survey_677328.lss → ...rces/surveys/limesurvey_survey_677328.lss b/...data/surveys/limesurvey_survey_677328.lss → ...rces/surveys/limesurvey_survey_677328.lss
diff --git a/...data/surveys/limesurvey_survey_834477.lss → ...rces/surveys/limesurvey_survey_834477.lss b/...data/surveys/limesurvey_survey_834477.lss → ...rces/surveys/limesurvey_survey_834477.lss
diff --git a/.../data/surveys/limesurvey_survey_88881.lss → ...urces/surveys/limesurvey_survey_88881.lss b/.../data/surveys/limesurvey_survey_88881.lss → ...urces/surveys/limesurvey_survey_88881.lss
diff --git a/...data/surveys/limesurvey_survey_917744.lss → ...rces/surveys/limesurvey_survey_917744.lss b/...data/surveys/limesurvey_survey_917744.lss → ...rces/surveys/limesurvey_survey_917744.lss
diff --git a/...data/surveys/limesurvey_survey_975622.lss → ...rces/surveys/limesurvey_survey_975622.lss b/...data/surveys/limesurvey_survey_975622.lss → ...rces/surveys/limesurvey_survey_975622.lss
diff --git a/tests/resources/data/travis/travis-ci-apache → tests/resources/travis/travis-ci-apache b/tests/resources/data/travis/travis-ci-apache → tests/resources/travis/travis-ci-apache
diff --git a/tests/resources/data/travis/travis_setup.sh → tests/resources/travis/travis_setup.sh b/tests/resources/data/travis/travis_setup.sh → tests/resources/travis/travis_setup.sh
diff --git a/...s/resources/data/views/adminBaseViews.php → tests/resources/views/adminBaseViews.php b/...s/resources/data/views/adminBaseViews.php → tests/resources/views/adminBaseViews.php
diff --git a/.../data/views/adminGeneralSettingsViews.php → ...urces/views/adminGeneralSettingsViews.php b/.../data/views/adminGeneralSettingsViews.php → ...urces/views/adminGeneralSettingsViews.php
diff --git a/...ces/data/views/adminParticipantsViews.php → ...esources/views/adminParticipantsViews.php b/...ces/data/views/adminParticipantsViews.php → ...esources/views/adminParticipantsViews.php
diff --git a/...sources/data/views/adminSettingsViews.php → tests/resources/views/adminSettingsViews.php b/...sources/data/views/adminSettingsViews.php → tests/resources/views/adminSettingsViews.php
diff --git a/...resources/data/views/adminSurveyViews.php → tests/resources/views/adminSurveyViews.php b/...resources/data/views/adminSurveyViews.php → tests/resources/views/adminSurveyViews.php
diff --git a/.../resources/data/views/adminUsersViews.php → tests/resources/views/adminUsersViews.php b/.../resources/data/views/adminUsersViews.php → tests/resources/views/adminUsersViews.php