Eole 49f416dc50 Merge branch 'develop' into Eole_Graph ... Conflicts: client/index.html client/js/controllers/home/home.js client/partials/home/home.html		2016-04-27 16:42:28 +02:00
..
home.js	Merge branch 'develop' into Eole_Graph	2016-04-27 16:42:28 +02:00
machineDetails.js	Clean code, add comment etc..	2016-04-17 18:50:05 +02:00