Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/res/layout/activity_main.xml
6 years ago · 0562c9bc33
parent a9683b6d06
commit 0562c9bc33
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@ -4,7 +4,7 @@
    <item
        android:id="@+id/home"
        android:icon="@drawable/ic_home_black_24dp"
-        android:title="@string/title_home" />
+        android:title="Home" />

    <item
        android:id="@+id/search"