Skip to content

Commit

Permalink
Merge branch 'pr/719' into devel
Browse files Browse the repository at this point in the history
Replace connect20/nexcessnet_turpentine package (@ihor-sviziev)
  • Loading branch information
aricwatson authored and aricwatson committed Jun 9, 2015
1 parent de7cc14 commit 8b4bee2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"email": "[email protected]"
}
],
"replace": {
"connect20/nexcessnet_turpentine": "self.version"
},
"require": {
"magento-hackathon/magento-composer-installer": "*"
}
Expand Down

0 comments on commit 8b4bee2

Please sign in to comment.