# Conflicts: # www/js/main.min.js
Add new basket + moving phone See merge request !19
Popup See merge request !17
# Conflicts: # src/app/frontend/views/index.php