# Conflicts: # www/js/main.min.js
Remote work New merge request From Alex:remote_work into Alex:master See merge request !23
Remote work New merge request From Alex:remote_work into Alex:master See merge request !20
Add new basket + moving phone See merge request !19
# Conflicts: # src/lib/sendmail.php
Popup See merge request !17
Remote work merge request From Alex:remote_work into Alex:master See merge request !16
Master New merge request From Alex:master into Alex:remote_work See merge request !15
