Merge branch 'develop' into feature-26

conflict
Обновить eula.txt
2025-05-26 21:23:55 +03:00 · 2025-05-26 21:22:05 +03:00 · 2025-05-26 18:20:55 +00:00 · 2025-05-26 18:19:49 +00:00 · 2025-05-26 21:18:36 +03:00
1 changed files with 2 additions and 1 deletions
--- a/eula.txt
+++ b/eula.txt
@ -1,3 +1,4 @@
 #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).
 #Tue May 13 13:55:01 EEST 2025
-eula=true
+eula=true 123152435
+12312
Author	SHA1	Message	Date
cuqmbr	2d6c098a40	Merge branch 'develop' into feature-26	2025-05-26 21:23:55 +03:00
cuqmbr	1ce9ca4ce2	conflict	2025-05-26 21:22:05 +03:00
cuqmbr	477280fa69	Обновить eula.txt	2025-05-26 18:20:55 +00:00
cuqmbr	8a5b6a05cd	Merge pull request 'changes' (#5 ) from feature-26 into develop Reviewed-on: Bebrashield/server-lobby#5	2025-05-26 18:19:49 +00:00
cuqmbr	1b0f40f660	changes	2025-05-26 21:18:36 +03:00