Konflikte aufgelöst

app/Http/Controllers/LanguageController.php

app/Http/Controllers/MailController.php

app/Http/routes.php

app/Jobs/Search.php

app/Models/Searchengine.php

public/css/editLanguage.css

public/css/help.css

public/js/widgets.js

resources/lang/de/faq.php

resources/lang/de/hilfe.php

resources/lang/de/index.php

resources/lang/en/faq.php

resources/lang/en/hilfe.php

resources/lang/en/index.php

resources/views/faq.blade.php

resources/views/hilfe.blade.php

resources/views/index.blade.php

resources/views/languages/edit.blade.php

resources/views/languages/overview.blade.php

resources/views/widget/sitesearch.blade.php