Merge branch 'main' into feature-yssa

Add marlo html file
2026-03-12 11:37:53 +01:00 · 2026-03-12 11:13:58 +01:00 · 2026-03-12 11:04:42 +01:00 · 2026-03-12 10:53:42 +01:00 · 2026-03-12 10:52:23 +01:00 · 2026-03-12 10:51:58 +01:00
5 changed files with 16 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,4 @@
 # msc-uxd-fs26-test
 Test-Repository für Unterrichtszwecke
 Test Marlo
--- a/alisa-olsson.html
+++ b/alisa-olsson.html
@ -0,0 +1,11 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
 </head>
 <body>
    <h1>Das ist meine erste Website</h1>
 </body>
 </html>
--- a/alisa-olsson.txt
+++ b/alisa-olsson.txt
@ -0,0 +1 @@
 Das ist meine persönliche Datei.
--- a/lara-hofer.txt
+++ b/lara-hofer.txt
@ -0,0 +1,2 @@
 Dies ist Laras persönliches File.
 Ich schreibe mal eine zweite Zeile. 
--- a/marlo.html
+++ b/marlo.html
Author	SHA1	Message	Date
Ysabelle Moser	0a22fa7a20	Merge branch 'main' into feature-yssa	2026-03-12 11:37:53 +01:00
Marlo-Baechli	8f6d4bf984	Add marlo html file	2026-03-12 11:13:58 +01:00
Marlo-Baechli	9504a5e03a	Add marlo html file	2026-03-12 11:04:42 +01:00
Alisa Cantillo-Olsson	c9c3138440	Merge pull request 'add file' (#16 ) from feature-alisa-olsson into main Reviewed-on: #16	2026-03-12 10:53:42 +01:00
Alisa Cantillo-Olsson	d5ecd9dd82	add html file	2026-03-12 10:52:23 +01:00
Marlo-Baechli	d4c9e87060	add marlo file	2026-03-12 10:51:58 +01:00
Edina Dauti	55f86ee4b6	Merge pull request 'add file' (#18 ) from feature-lara into main Passt :) Reviewed-on: #18	2026-03-12 10:51:42 +01:00
Lara	17f7908c4a	add file	2026-03-12 10:48:45 +01:00
Marlo-Baechli	fc4d68a29d	hi	2026-03-12 10:16:06 +01:00
Alisa Cantillo-Olsson	d70f4c7c03	add file	2026-03-12 09:59:24 +01:00
		`@ -0,0 +1,2 @@`
							`Dies ist Laras persönliches File.`
							`Ich schreibe mal eine zweite Zeile.`