From 8b4bee216419cdd9a04a928159a8d9ea1ed6c0fb Mon Sep 17 00:00:00 2001 From: aricwatson Date: Tue, 9 Jun 2015 11:10:23 -0400 Subject: [PATCH] Merge branch 'pr/719' into devel Replace connect20/nexcessnet_turpentine package (@ihor-sviziev) --- CHANGELOG.md | 2 +- composer.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 479765386..75a605225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -385,4 +385,4 @@ Magento CE 1.8+ or EE 1.13+, see [these instructions](https://github.com/nexcess * [#516] Fixes multiple sessions generated on first page visit (@jharrisonau) * [#796] Ignore additional GET Parameters in Varnish Cache via Configuration (@thampe) * [#626] Fix for dummy blocks not working (@jeroenvermeulen) - + * [#719) Replace connect20/nexcessnet_turpentine package in composer.json (@ihor-sviziev) diff --git a/composer.json b/composer.json index f203b99f6..fbc63ad77 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,9 @@ "email": "aheadley@nexcess.net" } ], + "replace": { + "connect20/nexcessnet_turpentine": "self.version" + }, "require": { "magento-hackathon/magento-composer-installer": "*" }