Merge remote-tracking branch 'remotes/origin/release-7.0.2.2'

loadedcommerce · Sep 27, 2013 · 5436c2d · 5436c2d
2 parents 6884aac + 5d6c76a
commit 5436c2d
Show file tree

Hide file tree

Showing 504 changed files with 19,589 additions and 28,287 deletions.
diff --git a/catalog/addons/Authnet_SIM_Payments/controller.php b/catalog/addons/Authnet_SIM_Payments/controller.php
diff --git a/catalog/addons/Authnet_SIM_Payments/images/authnet-small.png b/catalog/addons/Authnet_SIM_Payments/images/authnet-small.png
diff --git a/catalog/addons/Authnet_SIM_Payments/images/authnet.png b/catalog/addons/Authnet_SIM_Payments/images/authnet.png
diff --git a/catalog/addons/Authnet_SIM_Payments/languages/en_US.xml b/catalog/addons/Authnet_SIM_Payments/languages/en_US.xml