Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/res/values/strings.xml
2018-07-10 10:47:56 +02:00
parent 719f7feecd d83f9279d8
commit e3dd5f539a
26 changed files with 759 additions and 232 deletions
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,4 +34,5 @@

    <!-- TODO: Remove or change this placeholder text -->
    <string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
+    <string name="enter_offline_mode">Enter Offline Mode (%1$s)</string>
 </resources>