Merge branch 'master' of github.com:ChaosChemnitz/workadventure-map

2020-12-06 18:54:26 +01:00 · 2020-12-06 18:54:26 +01:00 · 0f59ffbafb
parent 1319f02372 37f3a15b32
commit 0f59ffbafb
3 changed files with 13 additions and 0 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,8 @@
+[submodule "rc3-world"]
+	path = world-maps
+	url = https://git.cccv.de/rc3/world-maps.git
+	branch = master
+
 [submodule "rc3-tiles"]
 	path = rc3_tiles
 	url = https://github.com/cbluoss/rc3_tiles.git
--- a/kreuzung/COPYRIGHT
+++ b/kreuzung/COPYRIGHT
@ -0,0 +1,7 @@
+bla
+Text
+nächster text
+UTF-8 ääääh macht ß sichtbar
+           dkdkdkd
+	tab	tsb
+exit
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 53e3310d472a4340a86c8080a4ddf53153e60b74
				`@ -0,0 +1 @@`
				`Subproject commit 53e3310d472a4340a86c8080a4ddf53153e60b74`