Merge branch 'shortcodes-category' of github.com:SiR-DanieL/woocommerce into shortcodes-category

Browse Source

Conflicts:
	includes/class-wc-shortcodes.php

...

This commit is contained in:

Nicola Mustone 2015-09-16 09:29:15 +02:00

parent ffc941fcb1 1fc762c0b6

commit 1a156d89b3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available