Merge remote-tracking branch 'origin/dev' into notifications-1

This commit is contained in:
TobiGr 2021-11-21 22:15:09 +01:00
commit 67edd370e3
32 changed files with 602 additions and 321 deletions

View file

@ -264,6 +264,7 @@
<string name="feed_update_threshold_key" translatable="false">feed_update_threshold_key</string>
<string name="feed_update_threshold_default_value" translatable="false">300</string>
<string name="feed_show_played_items_key" translatable="false">feed_show_played_items</string>
<string name="show_thumbnail_key" translatable="false">show_thumbnail_key</string>