Robert 8ef27c6b85 Merge remote-tracking branch 'origin/dev/m5_safak' into dev/m5_safak ...

# Conflicts:
#	M5/.idea/M5.iml
#	M5/.idea/dataSources.xml
#	M5/.idea/modules.xml
#	M5/.idea/php.xml
#	M5/Dossier/M5.md
#	M5/Werbeseite/index.php
#	M5/emensa/composer.json
#	M5/emensa/composer.lock
#	M5/emensa/config/db.php
#	M5/emensa/controllers/AnmeldungController.php
#	M5/emensa/controllers/MainController.php
#	M5/emensa/models/benutzer.php
#	M5/emensa/models/gerichte_main.php
#	M5/emensa/models/gerichte_self.php
#	M5/emensa/public/css/style.css
#	M5/emensa/public/index.php
#	M5/emensa/routes/web.php
#	M5/emensa/vendor/composer/autoload_psr4.php
#	M5/emensa/vendor/composer/autoload_static.php
#	M5/emensa/vendor/composer/installed.json
#	M5/emensa/vendor/composer/installed.php
#	M5/emensa/vendor/composer/platform_check.php

2024-01-10 10:46:02 +01:00

..

.gitignore

M4

2023-12-20 14:01:25 +01:00

codeception.xml

M5 A3 fertig

2023-12-20 17:21:49 +01:00

dataSources.xml

M4

2023-12-20 14:01:25 +01:00

M4.iml

M4

2023-12-20 14:01:25 +01:00

M5.iml

M5 A3 fertig

2023-12-20 17:21:49 +01:00

modules.xml

M4

2023-12-20 14:01:25 +01:00

php.xml

M5 A3 fertig

2023-12-20 17:21:49 +01:00

phpspec.xml

M5 A3 fertig

2023-12-20 17:21:49 +01:00

phpunit.xml

M5 A3 fertig

2023-12-20 17:21:49 +01:00

sqldialects.xml

M5 A2

2024-01-06 19:41:51 +01:00

vcs.xml

M4

2023-12-20 14:01:25 +01:00