Merge branch 'master' of github.com:zom/Zom-Android

zom · Feb 6, 2018 · 6466f7d · 6466f7d
2 parents 51c7def + 692d84e
commit 6466f7d
Show file tree

Hide file tree

Showing 5 changed files with 508 additions and 317 deletions.
diff --git a/app/src/androidTest/res/values-de/strings.xml b/app/src/androidTest/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="hello">Hallo Welt!</string>
+    <string name="app_name">Zom</string>
+
+</resources>