Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.1.5',
-  'full_app_version' => 'v8.1.5 - build 18388-g64aeaeeee',
-  'build_version' => '18388',
+  'app_version' => 'v8.1.15',
+  'full_app_version' => 'v8.1.15 - build 18405-ge4314cf42',
+  'build_version' => '18405',
   'prerelease_version' => '',
-  'hash_version' => 'g64aeaeeee',
-  'full_hash' => 'v8.1.5-141-g64aeaeeee',
-  'branch' => 'master',
+  'hash_version' => 'ge4314cf42',
+  'full_hash' => 'v8.1.15-13-ge4314cf42',
+  'branch' => 'develop',
 );

dev.docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - .env.dev.docker
 
   mariadb:
-    image: mariadb:11.5.2
+    image: mariadb:11.4.7
     volumes:
       - db:/var/lib/mysql
     env_file:
@@ -36,7 +36,7 @@ services:
       retries: 5
 
   redis:
-    image: redis:7.4.0
+    image: redis:7.4.3
 
   mailhog:
     image: mailhog/mailhog:v1.0.1

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - .env
 
   db:
-    image: mariadb:11.5.2
+    image: mariadb:11.4.7
     restart: unless-stopped
     volumes:
       - db_data:/var/lib/mysql