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