-
- Downloads
Merge branch 'development' into 'carsten-development-patch-79301'
# Conflicts: # resources/lang/en/resultPage.php
Showing
- app/Http/Controllers/MetaGerSearch.php 2 additions, 2 deletionsapp/Http/Controllers/MetaGerSearch.php
- resources/lang/de/faq.php 1 addition, 1 deletionresources/lang/de/faq.php
- resources/lang/de/index.php 48 additions, 48 deletionsresources/lang/de/index.php
- resources/lang/de/resultPage.php 1 addition, 2 deletionsresources/lang/de/resultPage.php
- resources/lang/de/spende.php 22 additions, 22 deletionsresources/lang/de/spende.php
- resources/lang/en/about.php 7 additions, 7 deletionsresources/lang/en/about.php
- resources/lang/en/asso.php 1 addition, 1 deletionresources/lang/en/asso.php
- resources/lang/en/resultPage.php 4 additions, 4 deletionsresources/lang/en/resultPage.php
- resources/lang/en/spende.php 8 additions, 4 deletionsresources/lang/en/spende.php
- resources/lang/en/team.php 2 additions, 2 deletionsresources/lang/en/team.php
- resources/less/metager/general/general.less 4 additions, 2 deletionsresources/less/metager/general/general.less
- resources/less/metager/pages/resultpage/result-page.less 17 additions, 28 deletionsresources/less/metager/pages/resultpage/result-page.less
- resources/less/metager/pages/resultpage/result.less 3 additions, 2 deletionsresources/less/metager/pages/resultpage/result.less
- resources/less/metager/pages/start-page.less 41 additions, 3 deletionsresources/less/metager/pages/start-page.less
- resources/less/metager/parts/searchbar.less 0 additions, 21 deletionsresources/less/metager/parts/searchbar.less
- resources/views/index.blade.php 9 additions, 4 deletionsresources/views/index.blade.php
- resources/views/layouts/researchandtabs.blade.php 2 additions, 2 deletionsresources/views/layouts/researchandtabs.blade.php
- resources/views/layouts/result.blade.php 0 additions, 3 deletionsresources/views/layouts/result.blade.php
- resources/views/layouts/resultPage.blade.php 1 addition, 1 deletionresources/views/layouts/resultPage.blade.php
- resources/views/parts/searchbar.blade.php 0 additions, 11 deletionsresources/views/parts/searchbar.blade.php
Loading
Please register or sign in to comment