Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

10e0f3b9

Commit 10e0f3b9 authored 7 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1023

parents af79f679 817fd198

No related branches found

No related tags found

Loading

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

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

app/Http/Controllers/MetaGerSearch.php
app/Models/Searchengine.php 0 additions, 4 deletions

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

config/laravellocalization.php
resources/assets/js/scriptStartPage.js 3 additions, 3 deletions

resources/assets/js/scriptStartPage.js
resources/lang/en/index.php 1 addition, 1 deletion

resources/lang/en/index.php
resources/lang/fr/index.php 1 addition, 1 deletion

resources/lang/fr/index.php
resources/views/index.blade.php 2 additions, 2 deletions

resources/views/index.blade.php
resources/views/layouts/researchandtabs.blade.php 0 additions, 16 deletions

resources/views/layouts/researchandtabs.blade.php
storage/app/public/qtdata.csv 4 additions, 3 deletions

storage/app/public/qtdata.csv
storage/app/public/tips.txt 9 additions, 7 deletions

storage/app/public/tips.txt

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