-
# Conflicts: # frontend/views/layouts/main.php
-
Conflicts: common/messages/ru/app.php common/messages/ua/app.php
-
Conflicts: frontend/controllers/SiteController.php frontend/views/layouts/main.php frontend/views/site/index.php
# Conflicts: # frontend/views/layouts/main.php
Conflicts: common/messages/ru/app.php common/messages/ua/app.php
Conflicts: frontend/controllers/SiteController.php frontend/views/layouts/main.php frontend/views/site/index.php