Skip to content

Commit a2d4339

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/develop' into MAGETWO-30809-compiled-definitions
2 parents 3873f2c + 209cfbe commit a2d4339

File tree

18,523 files changed

+167307
-200489
lines changed

Some content is hidden

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

18,523 files changed

+167307
-200489
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ atlassian*
3232
/pub/media/theme/*
3333
/pub/media/theme_customization/*
3434
!/pub/media/theme_customization/.htaccess
35+
/pub/media/wysiwyg/*
36+
!/pub/media/wysiwyg/.htaccess
3537
/pub/media/tmp/*
3638
!/pub/media/tmp/.htaccess
3739
/pub/static/*

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

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: php
22
php:
3-
- 5.4
43
- 5.5
4+
- 5.6
55
env:
66
- TEST_SUITE=unit
77
- TEST_SUITE=integration
@@ -10,9 +10,9 @@ env:
1010
- TEST_SUITE=static_annotation
1111
matrix:
1212
exclude:
13-
- php: 5.4
13+
- php: 5.6
1414
env: TEST_SUITE=static_phpcs
15-
- php: 5.4
15+
- php: 5.6
1616
env: TEST_SUITE=static_annotation
1717
before_install:
1818
- sudo apt-get update -qq

‎CHANGELOG.md

Lines changed: 263 additions & 89 deletions
Large diffs are not rendered by default.

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

0 commit comments

Comments
 (0)