Merge branch 'develop' into develop-anna-lyz

Merge branch 'develop-marcos_assuncao' into develop
Cria lista para merge
2026-05-20 21:54:19 -03:00 · 2026-05-20 21:33:20 -03:00 · 2026-05-20 21:32:21 -03:00 · 2026-05-20 21:24:44 -03:00 · 2026-05-20 21:21:12 -03:00 · 2026-05-18 23:59:48 +00:00
1 changed files with 14 additions and 1 deletions
--- a/index.php
+++ b/index.php
@@ -1 +1,14 @@
-<?php echo "Teste de Desploy develop e main2";
+<?php echo "Marcos Assunção";?>
 <br> 1 
 <br> 2
 <br> 3
 <br> 4
 <br> 5
 <br> 6
 <br> 7
 <br> 8
 <br> 9
 <br> 10
 <br> 11
 <br> 12
 <br> 13
Author	SHA1	Message	Date
2026-Anna Lyz	a6d4e8f6f6	Merge branch 'develop' into develop-anna-lyz	2026-05-20 21:54:19 -03:00
Marcos Assuncao	7b91169b33	Merge branch 'develop-marcos_assuncao' into develop	2026-05-20 21:33:20 -03:00
Marcos Assuncao	52d7108545	Cria lista para merge	2026-05-20 21:32:21 -03:00
2026-AnnaLyz da Silva Abrantes	68d9b7b21b	altera o texto de exemplo	2026-05-20 21:24:44 -03:00
Marcos Assunção	e33f1a6df9	Altera o texto de exemplo	2026-05-20 21:21:12 -03:00
Marcos Assunção	3a92010083	Merge pull request 'Corrige ortografia' (#35 ) from develop-marcos_assuncao into develop Reviewed-on: #35	2026-05-18 23:59:48 +00:00
Marcos Assunção	f86b68e4ed	Corrige ortografia	2026-05-18 20:59:12 -03:00