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

Merge branch 'development' into '733-lightslider-verweise-entfernen' 

# Conflicts:
#   webpack.mix.js
parents df832008 8dd59b80
2 merge requests!1262WIP: Resolve "Spendenseite Texte anpassen",!1222Resolve "Lightslider-Verweise entfernen"
Hide whitespace changes
Inline Side-by-side
Showing
with 81 additions and 80 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