Paul Lewis 4c0f5a4efe Merge remote-tracking branch 'mainline/develop' into PR_Branch ...

Conflicts:
	app/code/Magento/Catalog/Block/Product/Compare/Sidebar.php
	app/code/Magento/Checkout/Block/Cart/Sidebar.php
	app/code/Magento/Sales/Block/Reorder/Sidebar.php
	app/code/Magento/Wishlist/Block/Customer/Sidebar.php

2015-05-16 18:12:46 -05:00

..

framework

Merge remote-tracking branch 'ogresCE/MAGETWO-36920-Use-dashes-instead-of-underscores' into MAGETWO-22864-system-maintenance-command-2

2015-05-11 12:31:14 -05:00

testsuite

MAGETWO-36920: Use dashes instead of underscores in option names

2015-05-07 14:10:43 -05:00

.gitignore

Update as of 7/19/2012

2012-07-20 07:39:30 -07:00

benchmark.jmx

Merge remote-tracking branch 'mainline/develop' into PR_Branch

2015-05-16 18:12:46 -05:00

compare_reports.php

MAGETWO-33860: Improve PAT build experience

2015-02-13 18:20:20 +02:00

config.php.dist

MAGETWO-36920: Use dashes instead of underscores in option names

2015-05-07 15:21:02 -05:00

run_scenarios.php

MAGETWO-32146: Copying and Copyright Year Update

2015-01-09 10:11:39 -05:00