EoleDev d3fc2ab36c Merge branch 'Eole' into develop ... Conflicts: client/js/controllers/home/home.js		2016-03-23 14:43:27 +01:00
..
controllers	Merge branch 'Eole' into develop	2016-03-23 14:43:27 +01:00
services	Add login check	2016-03-20 11:23:06 +01:00
app.js	Front-end path redefinition	2016-03-16 11:11:25 +01:00