pom.xml MASTER
Cleanup + Changement URL heartbeat
Merge remote-tracking branch 'origin/dev'
Fix numéro de version sur le master
Merge remote-tracking branch 'origin/dev'
Merge Dev -> Master
Merge branch 'master' of https://github.com/logscl/nicobot

Conflicts:
	pom.xml
Amelioration chargement properties
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
Merge branch 'refs/heads/dev'
Merge branch 'refs/heads/dev'
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'refs/remotes/origin/dev'
Merge remote-tracking branch 'refs/remotes/origin/dev'
Merge remote-tracking branch 'refs/remotes/origin/dev'
Merge remote-tracking branch 'refs/remotes/origin/dev'
Update nicobot.properties

Changement serveur