Skip to content
Snippets Groups Projects
Commit f15a0eee authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'dev' into 'master' 

Need assets path

See merge request !392
parents a46a9014 18fdcc7a
No related branches found
No related tags found
2 merge requests!393Wrong dependencies,!392Need assets path
This commit is part of merge request !393. Comments created here will be created in the context of that merge request.
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 327 additions and 320 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment