Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

6f2114a1

Commit 6f2114a1 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !414

parents 692c6ec9 816a5393

Branches

No related tags found

4 merge requests!1061Development,!1046Patch,!444Merge mit Master,!414Development

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Console/Commands/LogRotate.php 119 additions, 0 deletions

app/Console/Commands/LogRotate.php
app/Console/Kernel.php 2 additions, 1 deletion

app/Console/Kernel.php
app/Http/Controllers/AdminInterface.php 33 additions, 0 deletions

app/Http/Controllers/AdminInterface.php
app/Http/routes.php 1 addition, 0 deletions

app/Http/routes.php
app/MetaGer.php 31 additions, 7 deletions

app/MetaGer.php
app/Models/Searchengine.php 0 additions, 1 deletion

app/Models/Searchengine.php
resources/views/admin/engines.blade.php 54 additions, 0 deletions

resources/views/admin/engines.blade.php

with 240 additions and 9 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