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

406234cf

Commit 406234cf authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !140

parents 7d3c1cef 83522751

No related branches found

No related tags found

1 merge request!1365Resolve "Filter Options for MetaGer"

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/AdminInterface.php 97 additions, 1 deletion

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

app/Http/routes.php
resources/views/admin/admin.blade.php 0 additions, 0 deletions

resources/views/admin/admin.blade.php
resources/views/admin/check.blade.php 9 additions, 0 deletions

resources/views/admin/check.blade.php
resources/views/admin/count.blade.php 17 additions, 0 deletions

resources/views/admin/count.blade.php

with 125 additions and 1 deletion

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