Frank Schubert 95a452bba7 Merge branch 'master' into 'devbyspi' ...

# Conflicts:
#   Layout/default/Device/Detail.php
#   Layout/default/Device/Form.php
#   Layout/default/Device/Index.php
#   application/Device/DeviceController.php
#   application/Device/DeviceModel.php
#   public/assets/css/datatables-std.css

2023-03-22 14:36:13 +00:00

..

Device.php

Changes by spi

2023-02-16 17:30:59 +01:00

DeviceController.php

Merge branch 'master' into 'devbyspi'

2023-03-22 14:36:13 +00:00

DeviceModel.php

Merge branch 'master' into 'devbyspi'

2023-03-22 14:36:13 +00:00