Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MetaGer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

7ae0adb1

Commit 7ae0adb1 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '342-wikipedia-steht-fur-ergebnisse-als-details-liste' into 'development'

Resolve "Wikipedia "steht für:" ergebnisse als details liste"

Closes #342

See merge request !547

parents bbb760e0 2cf66e1d

No related branches found

No related tags found

Loading

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/MetaGerSearch.php 39 additions, 23 deletions

app/Http/Controllers/MetaGerSearch.php
public/css/themes/default.css 23 additions, 1 deletion

public/css/themes/default.css
public/css/themes/default.css.map 1 addition, 1 deletion

public/css/themes/default.css.map
resources/assets/less/metager/quicktips.less 18 additions, 3 deletions

resources/assets/less/metager/quicktips.less
resources/lang/de/metaGerSearch.php 6 additions, 0 deletions

resources/lang/de/metaGerSearch.php
resources/views/quicktip.blade.php 19 additions, 10 deletions

resources/views/quicktip.blade.php
storage/app/public/ads.txt 1 addition, 1 deletion

storage/app/public/ads.txt

with 107 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment