-
-
Notifications
You must be signed in to change notification settings - Fork 361
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into multi-download
# Conflicts: # app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt # app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddCyclewayPartSurface.kt # app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddFootwayPartSurface.kt # app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddPathSurface.kt # app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt # app/src/main/java/de/westnordost/streetcomplete/quests/surface/DetailRoadSurface.kt
- Loading branch information
Showing
130 changed files
with
3,742 additions
and
1,350 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
# Do not edit. Source files are in /res/country_metadata | ||
atmOperators: [CIBC, RBC, TD Canada Trust, RBC Royal Bank, Scotiabank, Vancity, BMO, ScotiaBank, DC Bank, coastcapital | ||
savings, TD Bank, Royal Bank, Envision Financial, DCBank, Coast Capital] | ||
chargingStationOperators: [Flo, BC Hydro, ChargePoint, Tesla, Chargepoint, City of Maple Ridge / ChargePoint] | ||
chargingStationOperators: [Flo, ChargePoint, BC Hydro, Tesla, Chargepoint, City of Maple Ridge / ChargePoint] | ||
clothesContainerOperators: [Developmental Disabilities Association, Cerebral Palsy Association of BC, Canadian Diabetes Association, | ||
Big Brothers of Greater Vancouver Clothing Donation] | ||
officialLanguages: [en] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.