Merge branch 'master' into lieu_api

2017-12-26 10:47:29 -05:00
parent 2afcd74779 1e7cc23b81
commit bb9f6a4c6b
6 changed files with 8090 additions and 8090 deletions
--- a/resources/dictionaries/en/toponyms.txt
+++ b/resources/dictionaries/en/toponyms.txt
@@ -30,6 +30,7 @@ maine|me
 manitoba|mb
 maryland|md
 massachusetts|ma
+melbourne|melb
 michigan|mi
 minnesota|mn
 mississippi|ms
@@ -76,4 +77,4 @@ west virginia|wv
 western australia|wa
 wisconsin|wi
 wyoming|wy
-yukon|yt|the yukon|yukon territory
+yukon|yt|the yukon|yukon territory