Commit 48febc9b8f2f50f186cb42b6791f83295aa8a9b8
Merge branch 'remote_work' into 'master'
Remote work See merge request !5
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
src/app/frontend/views/about_eng.php
@@ -722,7 +722,7 @@ | @@ -722,7 +722,7 @@ | ||
722 | <div class="footer-bottom"> | 722 | <div class="footer-bottom"> |
723 | <div class="row"> | 723 | <div class="row"> |
724 | <div class="col-md-9"> | 724 | <div class="col-md-9"> |
725 | - <p>TM "Professional Seeds" that TM "Professional Fertilizers"The trademarks are registered on the territory of Ukraine. All rights are protected.</p> | 725 | + <p>All rights are protected.</p> |
726 | </div> | 726 | </div> |
727 | <div class="col-md-3"> | 727 | <div class="col-md-3"> |
728 | <p class="text-right">Website development <img src="/images/about/9/artweb_gray.png" alt="Артвеб"></p> | 728 | <p class="text-right">Website development <img src="/images/about/9/artweb_gray.png" alt="Артвеб"></p> |
src/app/frontend/views/please_return.php
1 | +<?php $in_cart = $this->session->get('in_cart', []); ?> | ||
1 | <!doctype html> | 2 | <!doctype html> |
2 | <html><head> | 3 | <html><head> |
3 | <meta charset="UTF-8"> | 4 | <meta charset="UTF-8"> |
@@ -438,4 +439,4 @@ $('#VideoModal_1').on('hidden.bs.modal', function() { | @@ -438,4 +439,4 @@ $('#VideoModal_1').on('hidden.bs.modal', function() { | ||
438 | 439 | ||
439 | 440 | ||
440 | </body> | 441 | </body> |
441 | -</html> | 442 | -</html> |
443 | +</html> | ||
442 | \ No newline at end of file | 444 | \ No newline at end of file |