// #PSCSX-2678, NOW to php date
Merge branch 'dev' of ssh://github.com/PrestaShop/dashactivity into dev

Conflicts:
	dashactivity.php