Commit 6e464f61 authored by Micksha's avatar Micksha

Merge branch 'manatree' into 'master'

update manatree

See merge request !239
parents 89d39e32 bcfa6591
Pipeline #143747806 passed with stages
in 23 minutes and 8 seconds