Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bfe8e698

Commit bfe8e698 authored 4 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1797

parents d044e02b f6008ca7

Branches

No related tags found

1 merge request!1797Development

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Console/Commands/RequestFetcher.php 4 additions, 2 deletions

app/Console/Commands/RequestFetcher.php
app/MetaGer.php 1 addition, 1 deletion

app/MetaGer.php
app/Models/Adgoal.php 12 additions, 1 deletion

app/Models/Adgoal.php
app/Models/Result.php 5 additions, 3 deletions

app/Models/Result.php
app/Models/parserSkripte/Overture.php 4 additions, 4 deletions

app/Models/parserSkripte/Overture.php
app/Models/parserSkripte/OvertureAds.php 2 additions, 2 deletions

app/Models/parserSkripte/OvertureAds.php
resources/lang/es/hilfe.php 26 additions, 0 deletions

resources/lang/es/hilfe.php
resources/lang/es/plugin-desktop/desktop-firefox.php 22 additions, 0 deletions

resources/lang/es/plugin-desktop/desktop-firefox.php
resources/views/layouts/result.blade.php 1 addition, 1 deletion

resources/views/layouts/result.blade.php
tests/Browser/Pages/Hilfe.php 1 addition, 1 deletion

tests/Browser/Pages/Hilfe.php

with 78 additions and 15 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