ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-27 08:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/add-thunderforest-source

Browse Source 
Conflicts:
	src/components/App.jsx
This commit is contained in:
orangemug
2018-07-27 15:43:02 +01:00
parent 45bdf53a41 cc51774259
commit fd59f42819
90 changed files with 11345 additions and 6012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/modals/SourcesModal.jsx
View File

@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
import styleSpec from '@mapbox/mapbox-gl-style-spec/style-spec'
import * as styleSpec from '@mapbox/mapbox-gl-style-spec/style-spec'
import Modal from './Modal'
import Button from '../Button'
import InputBlock from '../inputs/InputBlock'