Jeroen Baten 2025580e5c Merge branch 'master' of git://github.com/dgray16/libreplan into dgray16-master ... Conflicts: HACKING.rst doc/src/technical/howto-start-development-with-intellij-idea.rst fixed		2015-12-01 11:45:19 +01:00
..
src	Merge branch 'master' of git://github.com/dgray16/libreplan into dgray16-master	2015-12-01 11:45:19 +01:00
pom.xml	Bump version numbers in pom files to 1.4.1	2015-07-19 13:55:46 +02:00