Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v6-circleci-config

Conflicts:
	package-lock.json
	src/components/inputs/AutocompleteInput.jsx
This commit is contained in:
orangemug
2018-01-22 09:57:54 +00:00
9 changed files with 91 additions and 103 deletions
+1
View File
@@ -1,6 +1,7 @@
.maputnik-popup-layer {
display: block;
color: $color-lowgray;
cursor: pointer;
user-select: none;
line-height: 1.2;
padding: $margin-2;