Merge branch 'master' into dev

biologist79 · Sep 23, 2024 · 5b00b83 · 5b00b83
2 parents 1c3b427 + 9214a49
commit 5b00b83
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 41 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,7 @@
 # Changelog
 
-## DEV-branch
+
+## Version 2.2 (17.01.2024)
 
 * 19.09.2024: Document the virtual cards in the UI #333, thanks to @caco3 !
 * 18.09.2024: Re-designed tools page (#337), thanks to @caco3 !
@@ -101,7 +102,7 @@
 * 07.11.2023: Set timezone after startup, thanks to @Joe91 !
 
 
-## Version 2 (07.11.2023)
+## Version 2.1 (07.11.2023)
 
 * 04.11.2023: LPCD: wakeup check for ISO-14443 cards also with IRQ connected to port-expander
 * 04.11.2023: Bugfix for showing wrong loglevel

diff --git a/src/revision.h b/src/revision.h
@@ -1,4 +1,4 @@
 #pragma once
 
 #include "gitrevision.h"
-constexpr const char softwareRevision[] = "Software-revision: 20240919-1-DEV";
+constexpr const char softwareRevision[] = "Software-revision: 20240919-1-DEV";
diff --git a/test/webpage/package-lock.json b/test/webpage/package-lock.json