1
0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-11 17:16:50 -05:00

feat(rebase): rebasse

This commit is contained in:
Aiden Vigue
2021-02-15 11:33:12 -05:00
parent 9582196e1f
commit 01cd9d3872
4 changed files with 10 additions and 9 deletions

View File

@@ -590,12 +590,9 @@
"components.Settings.validationApplicationUrlTrailingSlash": "URL must not end in a trailing slash",
"components.Settings.validationHostnameRequired": "You must provide a hostname/IP",
"components.Settings.validationPortRequired": "You must provide a port",
<<<<<<< HEAD
"components.Settings.webhook": "Webhook",
"components.Setup.configureplex": "Configure Plex",
=======
"components.Setup.authorize": "Authorize",
>>>>>>> feat(all): add initial Jellyfin/Emby support
"components.Setup.configureservices": "Configure Services",
"components.Setup.connectmediaserver": "Connect Media Server",
"components.Setup.continue": "Continue",