Merge branch 'develop' into 'scrobbles-age'

# Conflicts: # src/i18n/en.json
2024-04-28 19:05:18 +00:00 · 2024-04-28 19:05:18 +00:00 · 51709ad318
commit 51709ad318
parent 4de9daa114 3056017f8e
208 changed files with 5530 additions and 2338 deletions
--- a/src/components/settings_modal/helpers/unit_setting.vue
+++ b/src/components/settings_modal/helpers/unit_setting.vue
@ -11,7 +11,7 @@
    </label>
    <input
      :id="path"
-      class="number-input"
+      class="input number-input"
      type="number"
      step="1"
      :disabled="disabled"