Commit ac06c1dd authored by Administrator's avatar Administrator

Merge branch 'map_model'

# Conflicts:
#	app/Http/Controllers/DevicesController.php
parents 03a67550 9589d331
Pipeline #56 canceled with stages