Merge branch 'master' into develop

LimeSurvey · Mar 11, 2020 · 94b594a · 94b594a
2 parents 7138a06 + 016b422
commit 94b594a
Show file tree

Hide file tree

Showing 28 changed files with 3,104 additions and 2,838 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,9 @@ notifications:
     on_failure: always 
 
 before_script:
+    # Before running composer install, check that the autoloader is up-to-date and all classes can be loaded.
+    - php tests/check_autoloader.php
+
     # Test
     #- sudo apt-get update
     #- sudo apt-get upgrade
@@ -33,6 +36,7 @@ before_script:
     - phpenv config-rm xdebug.ini
 
     # Install LimeSurvey.
+    - php -m  # Spit out all loaded PHP modules
     - mysql --version
     - sudo service mysql status
     - touch enabletests

diff --git a/application/config/version.php b/application/config/version.php
@@ -11,10 +11,10 @@
  * See COPYRIGHT.php for copyright notices and details.
  */
 
-$config['versionnumber'] = '4.1.8';
+$config['versionnumber'] = '4.1.10';
 $config['dbversionnumber'] = 425;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;
-$config['assetsversionnumber'] = '30123';
+$config['assetsversionnumber'] = '30125';
 return $config;