groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-07-10 11:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'refs/heads/master' into mf/rssInboundManager

Browse source 
# Conflicts:
#	client/strings/en-us.json
This commit is contained in:
mfcar 2024-05-19 00:09:39 +01:00
commit f2c9fd5a80
No known key found for this signature in database
71 changed files with 2147 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/pages/config/rss-feeds.vue
View file

@ -350,7 +350,7 @@ export default {
return null
})
if (!data) {
this.$toast.error('Failed to load RSS feeds')
this.$toast.error(this.$strings.ToastFailedToLoadData)
return
}
this.feeds = data.feeds