From 1a490f5be0c3ff2ae26c9ae7fe1610865cf9dec4 Mon Sep 17 00:00:00 2001
From: Vladimir Pelipenko <vpelipenko@ebay.com>
Date: Fri, 16 Jan 2015 17:22:56 +0200
Subject: [PATCH] MAGETWO-31053: M2 GitHub Update (version 0.42.0-beta4)
- fixed composer.lock and CHANGELOG.MD
---
CHANGELOG.md | 2 +-
composer.lock | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72586361cc8..fdf39c0d710 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,7 +81,7 @@
* Replaced end-to-end test for quick search with injectable test
* Fixed bugs:
* Fixed an issue where an exception occurred when adding configurable products to cart from the wishlist
- * Modify .gitignore CE according to new repos structure (MAGETWO-32095)
+ * Modify .gitignore CE according to new repos structure
* Fixed an issue where the 'Not %Username%?' link was displayed for a logged in user while pages were loaded
* Fixed an issue where Shopping Cart Price Rules based on product attributes were not applied to configurable products
* Fixed an issue where the Tax Class drop-down field on New Customer Group page contained the 'none' value when a tax class already existed
diff --git a/composer.lock b/composer.lock
index 92e80230113..06d749eaf44 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "5b6a910ddfa8d9e972d2f0d003f1fdf7",
+ "hash": "75a2ca5e0953876bb1f19a74c6c0134f",
"packages": [
{
"name": "composer/composer",
--
GitLab