Merge branch 'master' into mandatory_names

This commit is contained in:
Bryan Housel
2017-08-01 12:55:46 -04:00
7 changed files with 10 additions and 5 deletions
+2 -2
View File
@@ -6489,7 +6489,7 @@
"name": "Archaeological Site"
},
"historic/boundary_stone": {
"icon": "monument",
"icon": "poi-milestone",
"fields": [
"inscription"
],
@@ -10400,7 +10400,7 @@
"name": "Railway Crossing (Road)"
},
"railway/milestone": {
"icon": "triangle-stroked",
"icon": "poi-milestone",
"geometry": [
"point",
"vertex"
@@ -1,5 +1,5 @@
{
"icon": "monument",
"icon": "poi-milestone",
"fields": [
"inscription"
],
+1 -1
View File
@@ -1,5 +1,5 @@
{
"icon": "triangle-stroked",
"icon": "poi-milestone",
"geometry": [
"point",
"vertex"