Merge remote-tracking branch 'origin/master' into 66-es-werden-noch-keinerleid-logs-geschrieben (32c57481) · 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

32c57481

Commit 32c57481 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 66-es-werden-noch-keinerleid-logs-geschrieben

parents a2292059 248ed39a

No related branches found

No related tags found

Loading

Changes 10
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 6 additions, 4 deletions

.gitlab-ci.yml
LICENSE 651 additions, 0 deletions

LICENSE
app/Http/Controllers/MetaGerSearch.php 1 addition, 0 deletions

app/Http/Controllers/MetaGerSearch.php
app/MetaGer.php 1 addition, 0 deletions

app/MetaGer.php
app/Models/Results.php 0 additions, 65 deletions

app/Models/Results.php
app/Models/Searchengine.php 2 additions, 1 deletion

app/Models/Searchengine.php
app/Models/parserSkripte/Minisucher.php 5 additions, 1 deletion

app/Models/parserSkripte/Minisucher.php
app/Models/parserSkripte/Witch.php 2 additions, 3 deletions

app/Models/parserSkripte/Witch.php
app/Models/parserSkripte/Zeitde.php 2 additions, 0 deletions

app/Models/parserSkripte/Zeitde.php
public/index.php 12 additions, 2 deletions

public/index.php

with 682 additions and 76 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