woocommerce/assets
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
..
css Merge branch 'onboarding' 2015-07-04 23:11:12 +01:00
fonts Fixed chmod 2015-01-23 10:59:41 -02:00
images Styled auth and login endpoints 2015-05-14 16:58:34 +01:00
js Merge branch 'onboarding' 2015-07-04 23:11:12 +01:00