Skip to content

Commit 70394a6

Browse files
vpelipenkovpelipenko
committed
Merge pull request #22 from magento-goinc/MAGETWO-32146
MAGETWO-32146: Copying and Copyright Year Update
2 parents a1ab120 + 2e2b0e7 commit 70394a6

File tree

16,431 files changed

+32884
-16438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

16,431 files changed

+32884
-16438
lines changed

‎.php_cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56

67
/**

‎CONTRIBUTOR_LICENSE_AGREEMENT.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56
-->
67
<!DOCTYPE html>

‎COPYING.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
2+
3+
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
4+
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
5+
6+
Subject to Licensee�s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
7+
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎app/autoload.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
use Magento\Framework\Autoload\AutoloaderRegistry;
89
use Magento\Framework\Autoload\ClassLoaderWrapper;

‎app/bootstrap.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56

67
/**

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Inbox.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification inbox grid
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block;
89

‎app/code/Magento/AdminNotification/Block/System/Messages.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56
namespace Magento\AdminNotification\Block\System;
67

0 commit comments

Comments
 (0)