diff --git a/static/Changelog b/static/Changelog index 23c87b3..46ab486 100644 --- a/static/Changelog +++ b/static/Changelog @@ -2,24 +2,7 @@ Changelog ========= -%%version%% (unreleased) ------------------------- - -Changes -~~~~~~~ -- [misp-stix] Bumped latest version. [Christian Studer] - -Other -~~~~~ -- Merge branch 'develop' of github.com:MISP/MISP into 2.4. [Christian - Studer] -- Merge branch '2.4' of github.com:MISP/MISP into develop. [Christian - Studer] -- Merge branch 'develop' of github.com:MISP/MISP into develop. - [Christian Studer] - - -v2.4.183 (2024-01-04) +v2.4.183 (2024-01-05) --------------------- New @@ -36,6 +19,7 @@ New Changes ~~~~~~~ +- [misp-stix] Bumped latest version. [Christian Studer] - [VERSION] bump. [iglocska] - [internal] Refactor UserController::_postlogin. [Jakub Onderka] - [internal] Add 'Security.alert_on_suspicious_logins' to security @@ -122,7 +106,13 @@ Fix Other ~~~~~ +- Merge branch 'develop' of github.com:MISP/MISP into 2.4. [Christian + Studer] +- Merge branch '2.4' of github.com:MISP/MISP into develop. [Christian + Studer] - Merge branch 'develop' into 2.4. [iglocska] +- Merge branch 'develop' of github.com:MISP/MISP into develop. + [Christian Studer] - Merge pull request #9473 from JakubOnderka/logging. [Jakub Onderka] chg: [internal] Do not log in audit log last_api_access diff --git a/static/Changelog.txt b/static/Changelog.txt index 23c87b3..46ab486 100755 --- a/static/Changelog.txt +++ b/static/Changelog.txt @@ -2,24 +2,7 @@ Changelog ========= -%%version%% (unreleased) ------------------------- - -Changes -~~~~~~~ -- [misp-stix] Bumped latest version. [Christian Studer] - -Other -~~~~~ -- Merge branch 'develop' of github.com:MISP/MISP into 2.4. [Christian - Studer] -- Merge branch '2.4' of github.com:MISP/MISP into develop. [Christian - Studer] -- Merge branch 'develop' of github.com:MISP/MISP into develop. - [Christian Studer] - - -v2.4.183 (2024-01-04) +v2.4.183 (2024-01-05) --------------------- New @@ -36,6 +19,7 @@ New Changes ~~~~~~~ +- [misp-stix] Bumped latest version. [Christian Studer] - [VERSION] bump. [iglocska] - [internal] Refactor UserController::_postlogin. [Jakub Onderka] - [internal] Add 'Security.alert_on_suspicious_logins' to security @@ -122,7 +106,13 @@ Fix Other ~~~~~ +- Merge branch 'develop' of github.com:MISP/MISP into 2.4. [Christian + Studer] +- Merge branch '2.4' of github.com:MISP/MISP into develop. [Christian + Studer] - Merge branch 'develop' into 2.4. [iglocska] +- Merge branch 'develop' of github.com:MISP/MISP into develop. + [Christian Studer] - Merge pull request #9473 from JakubOnderka/logging. [Jakub Onderka] chg: [internal] Do not log in audit log last_api_access