Skip to content
Snippets Groups Projects
Commit ac634ac1 authored by bow's avatar bow
Browse files

Merge branch 'feature-add_toucan_to_shiva' into 'develop' 

Feature add toucan to shiva

see also #176 and #182 and #183

See merge request !204
parents 182492a4 d05d08f9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 132 additions and 31 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