Skip to content

Commit 2d621dd

Browse files
asubitasubit
authored
Merge pull request #2 from magento/develop
FIX Backend mass delete Sql error
2 parents 60704e8 + e7f5340 commit 2d621dd

File tree

24,128 files changed

+87507
-30899
lines changed

Some content is hidden

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

24,128 files changed

+87507
-30899
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ atlassian*
5151
!/var/.htaccess
5252
/vendor/*
5353
!/vendor/.htaccess
54+
/generated/*
55+
!/generated/.htaccess

‎.php_cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

‎Gruntfile.js.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright © 2016 Magento. All rights reserved.
2+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
55

‎app/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
use Magento\Framework\Autoload\AutoloaderRegistry;

‎app/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification inbox grid
44
*
5-
* Copyright © 2016 Magento. All rights reserved.
5+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2016 Magento. All rights reserved.
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\AdminNotification\Block\System;

0 commit comments

Comments
 (0)