Skip to content
Snippets Groups Projects
Commit 0c61a604 authored by olysenko's avatar olysenko
Browse files

Merge remote-tracking branch 'origin/MAGETWO-86452' into bugfixes

parents 7f324eb2 f12f6655
Branches
No related merge requests found
Copyright © 2013-2018 Magento, Inc.
Copyright © 2013-present Magento, Inc.
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
......
......@@ -45,7 +45,7 @@ Disallow: /*SID=
<welcome>Default welcome msg!</welcome>
</header>
<footer translate="copyright">
<copyright>Copyright &#169; 2013-2018 Magento, Inc. All rights reserved.</copyright>
<copyright>Copyright &#169; 2013-present Magento, Inc. All rights reserved.</copyright>
</footer>
</design>
<theme>
......
......@@ -142,7 +142,7 @@ Empty,Empty
"1 column","1 column"
Configuration,Configuration
"Default welcome msg!","Default welcome msg!"
"Copyright © 2013-2018 Magento, Inc. All rights reserved.","Copyright © 2013-2018 Magento, Inc. All rights reserved."
"Copyright © 2013-present Magento, Inc. All rights reserved.","Copyright © 2013-present Magento, Inc. All rights reserved."
"Design Config Grid","Design Config Grid"
"Rebuild design config grid index","Rebuild design config grid index"
"Admin empty","Admin empty"
......
......@@ -67,7 +67,7 @@ class SaveTest extends AbstractBackendController
'header_logo_height' => '',
'header_logo_alt' => '',
'header_welcome' => 'Default welcome msg!',
'footer_copyright' => 'Copyright © 2013-2018 Magento, Inc. All rights reserved.',
'footer_copyright' => 'Copyright © 2013-present Magento, Inc. All rights reserved.',
'footer_absolute_footer' => '',
'default_robots' => 'INDEX,FOLLOW',
'custom_instructions' => '',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment