Merge branch 'release/2024-03-22' into master-AIO

2024-03-21 15:16:08 -07:00
parent 32a98ed438 5bc224206c
commit d6e27c7ced
13 changed files with 753 additions and 571 deletions
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1165,6 +1165,7 @@
 				"loadingshop": "Loading shop data...",
 				"loggingin": "Authorizing...",
 				"markedexported": "Manually marked as exported.",
+				"media": "Media",
 				"message": "Message",
 				"monday": "Monday",
 				"na": "N/A",