dongpd 7181c32bbf Merge branch 'dev_DTD' into BiFacePro2.0.1 ... # Conflicts: # controllers/ApiController.php		2021-11-29 10:54:55 +07:00
..
ApiController.php	Merge branch 'dev_DTD' into BiFacePro2.0.1	2021-11-29 10:54:55 +07:00
CaptureLogsController.php	update multi language Login site	2021-08-30 17:21:11 +07:00
ConfigController.php	update alert when reset device failed	2021-09-20 15:11:00 +07:00
ControlLogsController.php	update multi language Login site	2021-08-30 17:21:11 +07:00
DashboardController.php	update multi language login site	2021-09-23 11:38:22 +07:00
ListManagementController.php	update multi language Login site	2021-08-30 17:21:11 +07:00
SiteController.php	update multi language login site	2021-09-23 11:38:22 +07:00
UserController.php	update multi language Login site	2021-08-30 17:21:11 +07:00