Skip to content
Snippets Groups Projects
Commit c31748f4 authored by Emanuel Omar Galan Ruiz's avatar Emanuel Omar Galan Ruiz
Browse files

Merge branch 'testing' into 'master' 

merging testing into master

See merge request !1
parents 182b7ca2 2b91d4d3
No related branches found
No related tags found
1 merge request!1merging testing into master
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 64 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment