Merge branch 'master' into ysy_temp_f

2017-01-19 15:08:53 +05:30
parent 92cf9904a8 bcd5e2a1bd
commit 89d5fe28c2
14 changed files with 321 additions and 106 deletions
@@ -51,12 +51,12 @@
            android:screenOrientation="portrait" />
        <activity
            android:name=".GeoTag.GeoTagStoreList"
-            android:label="@string/title_activity_store_list_geotag"
+            android:label="@string/title_activity_store_list"
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".dailyentry.StoreListActivity"
-            android:label="@string/title_activity_store_list_geotag"
+            android:label="@string/title_activity_store_list"
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity