Merge branch 'main' of github.com:MatiVant/ECC-tramites

# Conflicts:
#	Dockerfile
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#	git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch main
# Your branch and 'origin/main' have diverged,
# and have 1 and 15 different commits each, respectively.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	new file:   .dockerignore
#	deleted:    Dockerfile
#	modified:   app/layout.tsx
#	modified:   app/login/page.tsx
#	modified:   app/perfil/page.tsx
#	modified:   app/tramite/[id]/editar/page.tsx
#	modified:   components/app-header.tsx
#	modified:   components/app-layout.tsx
#	new file:   components/theme-toggle.tsx
#	modified:   components/ui/checkbox.tsx
#	modified:   lib/api/auth.service.ts
#	modified:   lib/api/types.ts
#	modified:   next.config.mjs
#	new file:   package-lock.json
#	modified:   package.json
#