Merge branch 'master' into feature/dialog-editor

# Conflicts:
#	src/components/dialogs/MapListDialog.tsx
#	src/modules/Poly.ts
#	src/styles/dialogs.less
This commit is contained in:
muerwre 2019-03-06 14:08:16 +07:00
commit d42586d9e0
25 changed files with 556 additions and 971 deletions

View file

@ -142,6 +142,7 @@ module.exports = () => {
devServer: {
historyApiFallback: true,
port: 8000,
// host: '192.168.88.40',
contentBase: 'dist',
publicPath: '/',
hot: true,