Merge remote-tracking branch 'origin/stable' into dev-branch

FOGProject · Aug 5, 2024 · af6c5de · af6c5de
2 parents 249da8d + 557a89b
commit af6c5de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/stable-releases-2_test-validity b/.github/workflows/stable-releases-2_test-validity
@@ -2,4 +2,5 @@
 # test validity of install
 # down the road-test various functions (deploy, capture, API)
 # Fix version if needed
-# merge pull request
+# merge pull request with generic commit
+# maybe update version if not handled in hook
diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.5.10.69');
+        define('FOG_VERSION', '1.5.10.70');
         define('FOG_SCHEMA', 271);
         define('FOG_BCACHE_VER', 141);
         define('FOG_CLIENT_VERSION', '0.13.0');