solve conflicts

Adjusted values in env.json
2025-05-14 13:30:29 +02:00 · 2025-05-14 13:28:02 +02:00 · 2025-05-14 06:35:39 +02:00 · 2025-05-13 09:22:09 +02:00
1 changed files with 0 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,7 +7,6 @@
 - Se ha añadido una restriccion en plantillas para que tan solo haya 1 por defecto

 ---
-
 ## [0.12.0] - 2025-05-13
 ### Added
 - Se ha añadido nueva API para poder gestionar las tareas y acciones programadas.
Author	SHA1	Message	Date
Manuel Aranda Rosales	dce63d1331	solve conflicts testing/ogcore-api/pipeline/head This commit looks good Details testing/ogcore-api/pipeline/pr-main Build started... Details	2025-05-14 13:30:29 +02:00
Manuel Aranda Rosales	527383bce1	solve conflicts ogcore-debian-package/pipeline/tag This commit looks good Details	2025-05-14 13:28:02 +02:00
Nicolas Arenas	d04e727f02	Adjusted values in env.json ogcore-debian-package/pipeline/head This commit looks good Details	2025-05-14 06:35:39 +02:00
Manuel Aranda Rosales	db216660bb	Merge pull request 'develop' (#31 ) from develop into main ogcore-debian-package/pipeline/head This commit looks good Details ogcore-debian-package/pipeline/tag This commit looks good Details Reviewed-on: #31	2025-05-13 09:22:09 +02:00