Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b468ed74

Commit b468ed74 authored 6 years ago by Phil Höfer

Downloads
- Plain Diff

Merge branch '809-partnershop-symbol-und-seite-anpassen' into 'development'

Resolve "Partnershop Symbol und Seite anpassen"

Closes #809

See merge request !1324

parents dbf9c596 d8aee736

No related branches found

No related tags found

Loading

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

resources/assets/less/metager/result.less 31 additions, 14 deletions

resources/assets/less/metager/result.less
resources/lang/de/partnershops.php 4 additions, 18 deletions

resources/lang/de/partnershops.php
resources/lang/en/partnershops.php 1 addition, 17 deletions

resources/lang/en/partnershops.php
resources/views/layouts/ad.blade.php 6 additions, 4 deletions

resources/views/layouts/ad.blade.php
resources/views/layouts/result.blade.php 10 additions, 9 deletions

resources/views/layouts/result.blade.php
resources/views/parts/fake-result.blade.php 6 additions, 4 deletions

resources/views/parts/fake-result.blade.php
resources/views/spende/partnershops.blade.php 4 additions, 3 deletions

resources/views/spende/partnershops.blade.php

with 62 additions and 69 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