woocommerce/includes/gateways
Mike Jolley 18c6a940f1 Merge branch 'onboarding'
Conflicts:
	assets/css/admin.css
	assets/css/select2.css
	assets/css/woocommerce-layout.css
	assets/css/woocommerce.css
	assets/js/admin/order-backbone-modal.min.js
	includes/admin/class-wc-admin-help.php
	includes/admin/class-wc-admin.php
	includes/admin/views/html-admin-page-status-report.php
	includes/admin/views/html-notice-install.php
	includes/admin/views/html-notice-template-check.php
	includes/admin/views/html-notice-theme-support.php
	includes/admin/views/html-notice-tracking.php
	includes/class-wc-install.php
	includes/class-wc-language-pack-upgrader.php

includes/shipping/international-delivery/class-wc-shipping-international
-delivery.php
2015-07-04 23:11:12 +01:00
..
bacs Show notice when pages don't exist, and set gateway defaults 2015-04-29 13:21:01 +01:00
cheque Absolute path and Indentation fix for includes/gateways/*.php :) 2014-09-21 01:27:58 +05:45
cod Update class-wc-gateway-cod.php 2015-04-22 16:41:51 -04:00
paypal Merge branch 'onboarding' 2015-07-04 23:11:12 +01:00
simplify-commerce fixes undefined constant ('error_code' > '$error' typo) 2015-06-01 12:52:01 +01:00