Merge branch 'b-7.0.x' into b-7.1.x

Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>

CHANGELOG.md

@@ -4,13 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [undecided] - unreleased
+## [v3.1.0] - unreleased
 
 ### Added
-- Admin controller
-- Template for admin controller
-- Example of extending of current admin template
-- ``oxNew`` object factory example
+- Admin controller example in Greeting namespace
+- Template for special greeting admin controller
+- Example with extending of current admin template
+- ``oxNew`` model object factory example in Greeting namespace infrastructure
 
 ## [v3.0.0] - 2024-06-27
 
@@ -37,7 +37,7 @@ This is the stable release for v3.0.0. No changes have been made since v3.0.0-rc
 - Smarty support
 - Migration are not triggered anymore on module activation. Ensure you run them separately after module **Installation**.
 
-## [undecided] - unreleased
+## [v2.2.0] - unreleased
 
 ### Added
 - Admin controller