Vadim f715698f7b Merge 1868: revert changes to default one, add new change set with fixes ... # Conflicts: # libreplan-business/src/main/resources/db.changelog-1.4.xml # libreplan-business/src/main/resources/db.changelog.xml		2018-07-11 10:43:30 +03:00
..
src	Merge 1868: revert changes to default one, add new change set with fixes	2018-07-11 10:43:30 +03:00
pom.xml	Merge libreplan-business module with ZK branch.	2016-10-27 10:05:20 +03:00