Better api integration

Merged Florent Chehab requested to merge better_api_integration into master

Merge request reports