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
..
controllers	Merge branch 'develop' into Eole_Graph	2016-04-27 16:42:28 +02:00
services	Clean code, add comment etc..	2016-04-17 18:50:05 +02:00
app.js	Add comments and correct some bugs	2016-04-17 18:42:15 +02:00