Merge branch 'dev' into patch-7

This commit is contained in:
Christian Schabesberger 2018-10-06 18:16:10 +02:00 committed by GitHub
commit 6a35494ef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
119 changed files with 420 additions and 688 deletions

View file

@ -517,5 +517,6 @@
<string name="minimize_on_exit_none_description">None</string>
<string name="minimize_on_exit_background_description">Minimize to background player</string>
<string name="minimize_on_exit_popup_description">Minimize to popup player</string>
<string name="switch_view">Switch View</string>
</resources>