Merge branch 'master' into check-location-permission

This commit is contained in:
Josephine Lim 2017-06-04 13:55:10 +10:00 committed by GitHub
commit bff00c988a
20 changed files with 182 additions and 42 deletions

View file

@ -197,7 +197,6 @@ Tap this message (or hit back) to skip this step.</string>
<string name="nearby_needs_permissions">Nearby places cannot be displayed without location permissions</string>
<string name="no_description_found">no description found</string>
<string name="nearby_info_menu_commons_article">Commons Article</string>
<string name="nearby_info_menu_wikidata_article">WikiData Article</string>
<string name="nearby_info_menu_wikidata_article">Wikidata item</string>
</resources>