forked from noxious/client
# Conflicts: # src/components/gameMaster/mapEditor/Map.vue # src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue # src/components/gameMaster/mapEditor/partials/Toolbar.vue # src/components/screens/MapEditor.vue