Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development (adddd1bd) · 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

adddd1bd

Commit adddd1bd authored 5 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development

parents 729e06f9 f6f10dd0

No related branches found

No related tags found

1 merge request!1433Development

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Models/parserSkripte/Kelkoo.php 2 additions, 2 deletions

app/Models/parserSkripte/Kelkoo.php
app/Models/parserSkripte/OvertureAds.php 1 addition, 1 deletion

app/Models/parserSkripte/OvertureAds.php
resources/lang/de/impressum.php 1 addition, 1 deletion

resources/lang/de/impressum.php
resources/lang/en/hilfe.php 28 additions, 21 deletions

resources/lang/en/hilfe.php
resources/lang/en/impressum.php 1 addition, 1 deletion

resources/lang/en/impressum.php

with 33 additions and 26 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