Schneider Roland 3daa39a0b6 Merge branch 'master' into develop ...

# Conflicts:
#	frontend/controllers/ContractController.php

2023-01-19 17:48:33 +01:00

..

assets

fix camera

2022-12-03 22:09:03 +01:00

components

replace yii object with baseobject

2022-06-12 09:01:37 +02:00

config

add event module

2021-09-27 20:43:58 +02:00

controllers

merge app api

2023-01-19 17:43:10 +01:00

models

merge app api

2023-01-19 17:43:10 +01:00

runtime

add feature enable/disable reception door log

2017-02-28 20:29:10 +01:00

views

Merge branch 'master' into develop

2023-01-19 17:48:33 +01:00

web

Merge branch 'master' into develop

2023-01-19 17:48:33 +01:00