Merge branch 'development' into 1142-include-key-for-paypal-donations (1398d1d9) · Commits · open-source / MetaGer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

1398d1d9

Commit 1398d1d9 authored 3 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 1142-include-key-for-paypal-donations

parents 92bfa73e 387d6c1e

No related branches found

No related tags found

3 merge requests!1937Development,!1926Development,!1896Resolve "Include Key for PayPal Donations"

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/MetaGer.php 40 additions, 34 deletions

app/MetaGer.php
app/Models/parserSkripte/BingBilder.php 2 additions, 23 deletions

app/Models/parserSkripte/BingBilder.php
resources/less/metager/general/cards.less 1 addition, 2 deletions

resources/less/metager/general/cards.less
resources/less/metager/pages/resultpage/quicktips.less 3 additions, 1 deletion

resources/less/metager/pages/resultpage/quicktips.less
resources/less/metager/pages/resultpage/result-page.less 47 additions, 28 deletions

resources/less/metager/pages/resultpage/result-page.less
resources/less/metager/parts/sidebar.less 74 additions, 23 deletions

resources/less/metager/parts/sidebar.less
resources/less/metager/variables.less 4 additions, 1 deletion

resources/less/metager/variables.less
resources/views/layouts/image_result.blade.php 2 additions, 5 deletions

resources/views/layouts/image_result.blade.php
resources/views/layouts/resultPage.blade.php 69 additions, 66 deletions

resources/views/layouts/resultPage.blade.php

with 242 additions and 183 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