Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a668a8b2

Commit a668a8b2 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !127

parents 27709d53 175edd0a

No related branches found

No related tags found

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

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/AdminInterface.php 16 additions, 3 deletions

app/Http/Controllers/AdminInterface.php
app/Models/parserSkripte/Dmoznebel.php 25 additions, 15 deletions

app/Models/parserSkripte/Dmoznebel.php
resources/views/admin.blade.php 27 additions, 7 deletions

resources/views/admin.blade.php

with 68 additions and 25 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