Lorenzo Tilve Álvaro cc246eedfa Merge branch 'master' into mpxj-import ... Conflicts: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java libreplan-webapp/pom.xml pom.xml		2013-04-16 09:34:31 +02:00
..
main	Merge branch 'master' into mpxj-import	2013-04-16 09:34:31 +02:00
test	Remove some allocation methods with LocalDate parameters	2012-11-15 13:15:07 +01:00