Mike Jolley c16acc6b51 Merge remote-tracking branch 'origin/master' ... # Conflicts: # assets/css/wc-setup-rtl.css # assets/css/wc-setup.css		2017-05-23 19:00:24 +01:00
..
Simplify	Merge remote-tracking branch 'origin/master'	2017-05-23 19:00:24 +01:00
Simplify.php	Add abspath checks	2017-05-10 19:03:19 +01:00