8ef27c6b85
# 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