Skip to content
Snippets Groups Projects
Commit ba32ec44 authored by Sivert Sliper's avatar Sivert Sliper
Browse files

Merge remote-tracking branch 'energy-driven/master' into new_branch

parents 768b2672 2edaf9e9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment