// follow up 2b3b4305999c2d1f7b4de81916c3fd2e956342a9
// Version updated to v0.4.4
// follow up 2b3b4305999c2d1f7b4de81916c3fd2e956342a9
Merge branch 'dev' of ssh://github.com/PrestaShop/dashactivity into dev
// Version update
Merge branch 'dev'

Conflicts:
	config.xml
	dashactivity.php
	views/templates/hook/dashboard_zone_one.tpl1.6.1