Konflikte aufgelöst

app/Http/Controllers/MetaGerSearch.php

app/Http/Controllers/StartpageController.php

app/Mail/Sprachdatei.php

app/MetaGer.php

config/laravellocalization.php

gulpfile.js

public/css/beitritt.css

public/css/themes/default.css

public/css/themes/default.css.map

public/img/snowflake.svg

public/js/all.js

public/js/all.js.map

public/js/quicktips.js

public/js/quicktips.js.map

resources/assets/js/lib/iframeResizer.contentWindow.min.js

resources/assets/js/lib/iframeResizer.min.js

resources/assets/js/scriptResultPage.js

resources/assets/less/default.less

resources/assets/less/metager/base.less

resources/assets/less/metager/metager.less