merge upstream

not needed
test
2026-01-22 21:03:28 +01:00 · 2026-01-22 17:32:38 +01:00 · 2026-01-22 17:31:23 +01:00 · 2026-01-22 12:25:26 +01:00 · 2026-01-22 12:23:29 +01:00 · 2026-01-20 16:14:59 +01:00
3 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,10 @@ lib/plrobjs/index
 !lib/plrobjs/U-Z/00
 !lib/plrobjs/ZZZ/00
 #don't commit logs
 !log/*
 !syslog.CRASH
 # also not autogenerated config file
 /lib/etc/config
 # or the list of last logins
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 Files for Grenzland-MUD
 Files for grenzland-mud, forked from tbamud
--- a/log/README
+++ b/log/README
@@ -1 +0,0 @@
 This directory is for log files.
Author	SHA1	Message	Date
agroschim	60c28bbfee	merge upstream	2026-01-22 21:03:28 +01:00
kyonshi	1433fb4145	not needed	2026-01-22 17:32:38 +01:00
kyonshi	b38e0deaf8	test	2026-01-22 17:31:23 +01:00
kyonshi	1a6953dc9f	Merge branch 'master' of https://gitea.wilderland.ovh/kyonshi/grenzland-mud	2026-01-22 12:25:26 +01:00
kyonshi	9b9bb8eab5	moving stuff around	2026-01-22 12:23:29 +01:00
kyonshi	b1844be82d	Update README.md	2026-01-20 16:14:59 +01:00
kyonshi	8fd4d5b234	Merge branch 'master' of https://gitea.wilderland.ovh/kyonshi/grenzland-mud	2026-01-20 16:13:41 +01:00
kyonshi	5ac7427a6f	Merge branch 'grenzland'	2026-01-20 16:11:17 +01:00
kyonshi	37ba5ea608	yep	2026-01-20 01:03:20 +01:00
kyonshi	8125d736c9	new branch Grenzland	2026-01-16 13:31:28 +01:00
`@@ -1,3 +1,5 @@`

		`Files for Grenzland-MUD`

	`Files for grenzland-mud, forked from tbamud`	`Files for grenzland-mud, forked from tbamud`