From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 3 May 2021 07:45:47 +0000 (+0200)
Subject: Merge branch 'v2.x'
X-Git-Tag: argeo-suite-2.3.1~55
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=34148928e47a56bde06635334fb06d4d5bb70d50;hp=-c

Merge branch 'v2.x'

Conflicts:
	core/org.argeo.entity.api/pom.xml
	core/org.argeo.entity.core/pom.xml
	core/org.argeo.entity.ui/pom.xml
	core/org.argeo.suite.core/pom.xml
	core/org.argeo.suite.theme.default/pom.xml
	core/org.argeo.suite.ui.rap/pom.xml
	core/org.argeo.suite.ui/pom.xml
	core/pom.xml
	dep/org.argeo.suite.dep.e4.rap/pom.xml
	dep/org.argeo.suite.dep.ui.rap/pom.xml
	dep/pom.xml
	dist/argeo-office/pom.xml
	dist/argeo-suite-demo/pom.xml
	dist/pom.xml
	environment/org.argeo.geo.ui/pom.xml
	environment/pom.xml
	knowledge/org.argeo.support.geonames/pom.xml
	knowledge/org.argeo.support.odk/pom.xml
	knowledge/org.argeo.support.xforms/pom.xml
	knowledge/pom.xml
	lib/pom.xml
	library/org.argeo.documents.ui/pom.xml
	library/pom.xml
	people/org.argeo.people.ui/pom.xml
	people/pom.xml
	pom.xml
	publishing/org.argeo.publishing.ui/pom.xml
	publishing/pom.xml
---

34148928e47a56bde06635334fb06d4d5bb70d50