// w3c
Merge branch 'dev' of https://github.com/PrestaShop/dashactivity into dev
// w3c
// w3c
// Added Readme.md
// Added Readme.md
[-] MO : Fixed Dashboard Activity module name
Merge pull request #2 from Caleydon/dashactivity-changes

[-] MO : Fixed Dashboard Activity module name
// Translate after the constructor
[-] MO: Dashactivity time now()

To prevent different timezone with mysql use date() php instead of now() mysql
Merge pull request #3 from jorgevrgs/patch-1

[-] MO: Dashactivity time now()
//version update
Merge branch 'dev'
// ip2long on an ipv6 does not return an integer to it needs to be casted in int
//Version update
Merge branch 'dev'
// #PSCSX-2678, NOW to php date
Merge branch 'dev' of ssh://github.com/PrestaShop/dashactivity into dev

Conflicts:
	dashactivity.php
//Version update
Merge branch 'dev'