Mike Jolley e271825ffb Merge branch 'master' into tax-rate-auto-ordering ... # Conflicts: # assets/css/admin.css		2016-08-02 14:17:23 +01:00
..
css	Merge branch 'master' into tax-rate-auto-ordering	2016-08-02 14:17:23 +01:00
fonts	HTTPS for everybody	2016-05-26 22:48:49 -03:00
images	re-add the .png credit card icons as a fallback for gateways using core assets.	2016-04-27 13:55:43 +01:00
js	Merge branch 'master' into tax-rate-auto-ordering	2016-08-02 14:17:23 +01:00