merge: release 2023.12.0

fix: merge conflict
chore: change version
2023-12-31 23:19:41 +01:00 · 2023-12-31 23:11:15 +01:00 · 2023-12-31 22:49:43 +01:00 · 2023-12-01 00:01:19 +01:00 · 2023-11-30 23:57:04 +01:00 · 2023-11-26 18:47:44 +01:00
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "sharkey",
-	"version": "2023.12.0.beta3",
+	"version": "2023.12.0",
 	"codename": "shonk",
 	"repository": {
 		"type": "git",
Author	SHA1	Message	Date
Marie	b81448edf6	merge: release 2023.12.0	2023-12-31 23:19:41 +01:00
Marie	134d2895f0	fix: merge conflict	2023-12-31 23:11:15 +01:00
Marie	7ba8fde9b9	chore: change version	2023-12-31 22:49:43 +01:00
Marie	1022280465	release: 2023.11.2	2023-12-01 00:01:19 +01:00
Marie	021d3924e6	chore: change version	2023-11-30 23:57:04 +01:00
Mar0xy	b6d50d781f	Merge branch 'stable' of https://github.com/transfem-org/Sharkey into stable	2023-11-26 18:47:44 +01:00
Mar0xy	1d411bb885	chore: fix locales	2023-11-26 18:47:20 +01:00
Marie	f7afd1ae4a	release: 2023.11.1	2023-11-26 17:28:42 +01:00
Marie	1ef1f2a03c	Merge branch 'stable' into release/2023.11.1	2023-11-26 17:26:30 +01:00
Marie	829ce4f86a	merge: 2023.11.0	2023-11-07 20:16:20 +01:00
Mar0xy	6d5d863150	merge: last minute changes	2023-11-07 20:07:53 +01:00
Marie	fc7d4bc420	chore: set release version	2023-11-07 19:39:18 +01:00