Merge branch 'dev' into dev
This commit is contained in:
commit
bc0564fa07
31 changed files with 1130 additions and 204 deletions
|
|
@ -175,7 +175,9 @@
|
|||
<string name="main_page_content_key" translatable="false">main_page_content</string>
|
||||
<string name="enable_playback_resume_key" translatable="false">enable_playback_resume</string>
|
||||
<string name="enable_playback_state_lists_key" translatable="false">enable_playback_state_lists</string>
|
||||
|
||||
<string name="newpipes_language_key" translatable="false">newpipes_language_key</string>
|
||||
<string name="enable_lock_screen_video_thumbnail_key" translatable="false">enable_lock_screen_video_thumbnail</string>
|
||||
|
||||
<string name="import_data" translatable="false">import_data</string>
|
||||
<string name="export_data" translatable="false">export_data</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue