Mike Jolley 4877e28fcc Merge branch '2.1' ... Conflicts: i18n/languages/woocommerce-admin.pot i18n/languages/woocommerce.pot package.json readme.txt woocommerce.php		2014-05-14 14:14:38 +01:00
..
css	Merge branch '2.1'	2014-05-14 14:14:38 +01:00
fonts	edit icon. #4287	2013-12-05 15:03:27 +00:00
images	Revert "Removed obsolete edit icon #4753"	2014-02-13 22:19:07 +01:00
js	[2.2] Respect login hidden toggle Fixes #5479	2014-05-14 11:38:06 +01:00