Conflicts: code/apps/shop/views/Edit.html
Gray See merge request !5
Feature/1215 See merge request !4