-
# Conflicts: # frontend/controllers/CabinetController.php # frontend/models/IntellectualProperty.php
-
# Conflicts: # frontend/views/cabinet/index.php
-
# Conflicts: # frontend/views/cabinet/index.php
# Conflicts: # frontend/controllers/CabinetController.php # frontend/models/IntellectualProperty.php
# Conflicts: # frontend/views/cabinet/index.php
# Conflicts: # frontend/views/cabinet/index.php