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

This commit is contained in:
Michael Kaufmann
2024-10-09 10:57:40 +02: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.1'),
('panel', 'version', '2.2.2'),
('panel', 'db_version', '202409280');

View File

@@ -178,3 +178,8 @@ if (Froxlor::isDatabaseVersion('202408140')) {
Froxlor::updateToDbVersion('202409280');
}
if (Froxlor::isFroxlorVersion('2.2.1')) {
Update::showUpdateStep("Updating from 2.2.1 to 2.2.2", false);
Froxlor::updateToVersion('2.2.2');
}

View File

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