Skip to content

update to the latest develop #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3,568 commits into from
Oct 22, 2015
Merged

update to the latest develop #2

merged 3,568 commits into from
Oct 22, 2015

Conversation

tomispepe
Copy link
Owner

No description provided.

Cari Spruiell and others added 30 commits October 12, 2015 22:48
…Phrases-Does-Not-Follow-Symlinks' into API-Bug-Fixes
…s-are-displayed-in-Backend-while-browser-page-is-loaded' into API-Bug-Fixes
…if click PayPal Check out in shopping cart
- Fixes after merge with mainline
 - Fixed incorrect variable usage
 - Updated version of code sniffer
Conflicts:
	app/code/Magento/Authorizenet/Model/Authorizenet.php
	app/code/Magento/Braintree/Model/PaymentMethod.php
	app/code/Magento/Braintree/Model/PaymentMethod/PayPal.php
Volodymyr Zaets and others added 27 commits October 20, 2015 13:39
…s error)

- Fix code style on huge legacy files
[Mavericks] Test maintenance and extend
@tomispepe
Copy link
Owner Author

update to latest in develop

tomispepe added a commit that referenced this pull request Oct 22, 2015
update to the latest develop
@tomispepe tomispepe merged commit 1c14a40 into tomispepe:develop Oct 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.