-
# Conflicts: # src/app/frontend/controllers/PageController.php # src/app/frontend/views/page/changeWithSize.php # src/app/frontend/views/partial/item_group.php # src/lib/common.php
-
# Conflicts: # www/js/main.min.js
-
# Conflicts: # src/lib/sendmail.php
-
Popup See merge request !17
-
# Conflicts: # src/app/frontend/views/index.php