ale 63ce45f903 Merge branch 'master' into funcion/actualizaciones ... # Conflicts: # package-lock.json # package.json		2025-08-12 15:29:33 -03:00
..
api.php	Api de ollas movido a web	2025-06-23 22:49:02 -03:00
channels.php	Commit inicial	2021-12-30 11:49:40 -03:00
console.php	Commit inicial	2021-12-30 11:49:40 -03:00
web.php	Merge branch 'master' into funcion/actualizaciones	2025-08-12 15:29:33 -03:00