Skip to content
Snippets Groups Projects
Commit 85adeb75 authored by BEAUVAIS ANTOINE's avatar BEAUVAIS ANTOINE
Browse files

Merge branch 'master' into 'develop'

Master to develop

See merge request !30
parents adfbd428 f7cfa865
2 merge requests!31Added category names to Item JSON.,!30Master to develop
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