Skip to content

Commit cad82c8

Browse files
author
vklymenko
committed
Merge remote-tracking branch 'm2origin/2.0' into 2.0-develop
# Conflicts: # composer.lock # dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml
2 parents 41448ec + 99cb92d commit cad82c8

File tree

21,254 files changed

+21732
-21730
lines changed

Some content is hidden

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

21,254 files changed

+21732
-21730
lines changed

‎.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

‎.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ before_script:
5252
sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
5353
sudo apt-get autoremove;
5454
sudo apt-get autoclean;
55-
sudo apt-add-repository ppa:ondrej/mysql-5.6 -y;
55+
echo 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-apt-config' | sudo tee /etc/apt/sources.list.d/mysql.list;
56+
echo 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6' | sudo tee /etc/apt/sources.list.d/mysql.list;
57+
curl -s http://ronaldbradford.com/mysql/mysql.gpg | sudo apt-key add -;
5658
sudo apt-get update;
57-
sudo apt-get install mysql-server-5.6 mysql-client-5.6;
59+
sudo apt-get install -y mysql-server;
5860
mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
5961
mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
6062
fi"

‎CONTRIBUTOR_LICENSE_AGREEMENT.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
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
-->
@@ -134,4 +134,4 @@ <h2>
134134
</table>
135135
</div>
136136
</body>
137-
</html>
137+
</html>

‎Gruntfile.js

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;

0 commit comments

Comments
 (0)