Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a781330b

Commit a781330b authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !255

parents d52136be fffa3781

No related branches found

No related tags found

2 merge requests!267Bugfix,!255Development

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/MetaGerSearch.php 0 additions, 3 deletions

app/Http/Controllers/MetaGerSearch.php
app/MetaGer.php 17 additions, 7 deletions

app/MetaGer.php
app/Models/Searchengine.php 37 additions, 13 deletions

app/Models/Searchengine.php
config/cache.php 1 addition, 1 deletion

config/cache.php

with 55 additions and 24 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