Merge branch 'main' of https://git.ieslamar.org/Santi/ProyectoFinalPython

Carpeta imagenes
Imagen para readme
2024-12-14 01:25:25 +01:00 · 2024-12-14 01:23:55 +01:00 · 2024-12-14 01:23:27 +01:00
6 changed files with 4 additions and 1 deletions
--- a/Imagen/img.png
+++ b/Imagen/img.png
--- a/app/chat_server/messages.txt
+++ b/app/chat_server/messages.txt
@ -1,2 +1,4 @@
 1|User|Hola
 2|feo|hola
+3|feo|uybsdfuhbsd
+4|kevion|hola
--- a/app/config.ini
+++ b/app/config.ini
@ -1,6 +1,6 @@
 [Chat]
 server = http://localhost:2020
-name = feo
+name = kevion

 [Weather]
 city = Denia
--- a/app/music/Cyclo
+++ b/app/music/Cyclo
--- a/app/music/Katekyo
+++ b/app/music/Katekyo
--- a/app/todo.list
+++ b/app/todo.list
@ -0,0 +1 @@
+ertdgfjkg
Author	SHA1	Message	Date
Santiago Parra	86425ced1e	Merge branch 'main' of https://git.ieslamar.org/Santi/ProyectoFinalPython	2024-12-14 01:25:25 +01:00
Santiago Parra	7e5dc9c89d	Carpeta imagenes	2024-12-14 01:23:55 +01:00
Santiago Parra	55965233ab	Imagen para readme	2024-12-14 01:23:27 +01:00