commit cfc41bb48e4fc66dd2bf04588e24f590147cef45
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Tue Apr 25 16:24:44 2017 +0200
ah le code legacy,
même pas foutu de respected la norme javabean :-\
commit 771136b238f375edf44c092c8c37b6014919e6cf
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Wed Mar 8 19:15:11 2017 +0100
java Date API sucks
commit 2b67097a80dc5e970b12665924ebc73b751adc10
Merge: f9fcc1b9 5b11b30d
Author: Marc <marc.audefroy@ovh.fr>
Date: Tue Dec 8 18:27:06 2015 +0100
Merge branch 'cospeakers' Note du dev : GRRRRRRR
Conflicts:
src/main/java/fr/sii/controller/restricted/session/SessionController.java
src/main/java/fr/sii/dto/TalkUser.java
src/main/java/fr/sii/dto/mapping/TalkMapping.java
src/main/java/fr/sii/service/TalkUserService.java
src/main/resources/changelog/changelog-1.0.xml
src/main/static/app/scripts/controllers/restricted/talks/edit.js
commit dc41801e45d6c1c23b17325eafe712824808e9be
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Sat Nov 7 14:33:42 2015 +0100
can’t run with java 8