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

3ff2e9d1

Commit 3ff2e9d1 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !148

parents 36442636 af313829

No related branches found

No related tags found

2 merge requests!151Bugfix,!148Development

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/AdminInterface.php 8 additions, 53 deletions

app/Http/Controllers/AdminInterface.php
app/MetaGer.php 4 additions, 1 deletion

app/MetaGer.php
app/Providers/AppServiceProvider.php 23 additions, 16 deletions

app/Providers/AppServiceProvider.php
resources/views/admin/count.blade.php 27 additions, 8 deletions

resources/views/admin/count.blade.php

with 62 additions and 78 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