Merge remote-tracking branch 'remotes/origin/develop'

loadedcommerce · Feb 11, 2015 · 6e8a166 · 6e8a166
2 parents 087e68a + 0ff578d
commit 6e8a166
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 2,196 deletions.
diff --git a/catalog/addons/Itembase/controller.php b/catalog/addons/Itembase/controller.php
diff --git a/catalog/addons/Itembase/hooks/itembase.xml b/catalog/addons/Itembase/hooks/itembase.xml
diff --git a/catalog/addons/Itembase/images/itembase.png b/catalog/addons/Itembase/images/itembase.png