Skip to content
Snippets Groups Projects
Commit bebc0a4d 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 123c0fc0 9452c2cd
No related branches found
No related tags found
2 merge requests!965Development,!957Added js-only class, that only shows its element when js is activated
Hide whitespace changes
Inline Side-by-side
Showing
with 334 additions and 273 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment