Merge branch 'develop' of https://github.com/InaneCoding/Piwik-OpenCa… · InaneCoding/Piwik-OpenCart-Ecommerce-VQMod@da3fb9a · GitHub

Commit

Merge branch 'develop' of https://github.com/InaneCoding/Piwik-OpenCa…

Browse files

…rt-Ecommerce-VQMod into develop

resolving conflict arising from commiting with "amend last commit"!
Conflicts:
upload/admin/language/english/module/piwik.php

Loading branch information

kevinb456 committed Feb 17, 2014

2 parents d4945f4 + 55dbed6 commit da3fb9a