Paul Luchyn fbd3a66cbd Merge remote-tracking branch 'upstream/master'		2016-11-18 13:01:38 +02:00
..
jasper	Merge libreplan-webapp module with ZK branch.	2016-10-27 10:05:21 +03:00
java/org/libreplan	Merge remote-tracking branch 'upstream/master'	2016-11-18 13:01:38 +02:00
resources	Remove slf4j-jdk14 dependency.	2016-11-15 15:37:16 +02:00
webapp	Remove slf4j-jdk14 dependency.	2016-11-15 15:37:16 +02:00