Merge branch 'development' into 'master' (db8653e8) · 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

db8653e8

Commit db8653e8 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !122

parents 64c65621 63f4e3a1

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/AdminInterface.php 31 additions, 0 deletions

app/Http/Controllers/AdminInterface.php
app/Http/routes.php 2 additions, 0 deletions

app/Http/routes.php
app/Providers/AppServiceProvider.php 35 additions, 1 deletion

app/Providers/AppServiceProvider.php
composer.lock 6 additions, 6 deletions

composer.lock
database/metager.sqlite 0 additions, 0 deletions

database/metager.sqlite
resources/views/admin.blade.php 60 additions, 0 deletions

resources/views/admin.blade.php

with 134 additions and 7 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