Skip to content
Snippets Groups Projects
Commit 75684838 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' into '530-js-only-class'

# Conflicts:
#   gulpfile.js
#   resources/views/index.blade.php
parents 4c2e0397 94e3a8b9
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Showing
with 334 additions and 273 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 to comment