Skip to content

Commit

Permalink
Merge pull request #979 from steverobbins/feature/copying
Browse files Browse the repository at this point in the history
Adding OSL license file name (MAGETWO-32824)
  • Loading branch information
vpelipenko committed Jan 20, 2015
2 parents 1a490f5 + b328d83 commit bce7e15
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions COPYING.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license

http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact [email protected] for a copy.
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.

Subject to Licensees 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.
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.
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 comments on commit bce7e15

Please sign in to comment.