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.html	Merge branch 'develop' into Eole_Graph	2016-04-27 16:42:28 +02:00
machineDetails.html	Clean some things	2016-03-02 20:46:24 +01:00