Commit 49f9dc11 authored by Nicolau Manubens Gil's avatar Nicolau Manubens Gil
Browse files

Merge branch 'develop-NAO' into 'master'

Develop nao

This feature is ready to be tested. @lpcaron is in charge of that. Deadline to be decided tomorrow. Thanks!

See merge request !96
parents edb7b009 e3844b74
Supports Markdown
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