Skip to content
Snippets Groups Projects
Commit 60d4da26 authored by Max Maria Humbert's avatar Max Maria Humbert
Browse files

Merge branch 'dev-max' into 'develop'

# Conflicts:
#   catkin_ws/src/learn_environment/task_pool/task_definitions.json
parents 3e18af4a 2fae01fe
Branches
No related tags found
1 merge request!3merge malte changes from develop into dev-max
Showing
with 121 additions and 1160 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment