# Conflicts: # src/app/frontend/views/index.php
Remote work merge request From Alex:remote_work into Alex:master See merge request !13
Master merge request From Alex:master into Alex:remote_work See merge request !12