Merge remote-tracking branch 'origin/main' into v2.2

This commit is contained in:
Michael Kaufmann
2024-11-02 08:53:33 +01:00
3 changed files with 7 additions and 2 deletions

View File

@@ -730,7 +730,7 @@ opcache.validate_timestamps'),
('panel', 'logo_overridecustom', '0'),
('panel', 'settings_mode', '0'),
('panel', 'menu_collapsed', '1'),
('panel', 'version', '2.2.4'),
('panel', 'version', '2.2.5'),
('panel', 'db_version', '202409280');

View File

@@ -193,3 +193,8 @@ if (Froxlor::isFroxlorVersion('2.2.3')) {
Update::showUpdateStep("Updating from 2.2.3 to 2.2.4", false);
Froxlor::updateToVersion('2.2.4');
}
if (Froxlor::isFroxlorVersion('2.2.4')) {
Update::showUpdateStep("Updating from 2.2.4 to 2.2.5", false);
Froxlor::updateToVersion('2.2.5');
}

View File

@@ -31,7 +31,7 @@ final class Froxlor
{
// Main version variable
const VERSION = '2.2.4';
const VERSION = '2.2.5';
// Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '202409280';