Commit fa2a2bfd authored by Ivan Chepurnyi's avatar Ivan Chepurnyi

Merge branch 'master' of github.com:EcomDev/EcomDev_PHPUnit

Conflicts:
	shell/ecomdev-phpunit.php
parents 62c4bdf6 efc9f121
<a href="http://www.ecomdev.org/services/magento-development?utm_source=github&utm_medium=logo&utm_campaign=github">![EcomDev](http://www.ecomdev.org/wp-content/themes/ecomdev/images/logo.png)</a>
Magento PHPUnit Integration Magento PHPUnit Integration
=========================== ===========================
...@@ -77,3 +79,4 @@ If you want to take a part in improving our extension please create branches bas ...@@ -77,3 +79,4 @@ If you want to take a part in improving our extension please create branches bas
Then submit them for pull request. Then submit them for pull request.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment