Merge branch 'dev' for release 5.5.0

sleede · Nov 8, 2022 · fa4a2c3 · fa4a2c3
2 parents 524540c + de26ae0
commit fa4a2c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog Fab-manager
 
+## v5.5.0 2022 November 08
+
+- Feature Fablab Store
+- Feature Allow admin to reserve for himself
 - Allow searching by username (#401)
 - Fix a bug: adding a new event without updating the dates results in internal server error (undefined method `div' for nil)
 - Fix a bug: portuguese time formatting (#405)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "5.4.25",
+  "version": "5.5.0",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",