From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 27 Feb 2022 08:29:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.105~4
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=fba42be03bc7ec07d464f8942f7dfa2e5f0d6f17;hp=fba42be03bc7ec07d464f8942f7dfa2e5f0d6f17;p=lgpl%2Fargeo-commons.git

Merge remote-tracking branch 'origin/unstable' into testing

Conflicts:
	cnf/build.bnd
	cnf/maven.bnd
	demo/pom.xml
	dep/org.argeo.dep.cms.client/pom.xml
	dep/org.argeo.dep.cms.e4.rap/pom.xml
	dep/org.argeo.dep.cms.ext/pom.xml
	dep/org.argeo.dep.cms.node/pom.xml
	dep/org.argeo.dep.cms.ui.rap/pom.xml
	dep/pom.xml
	dist/argeo-cli/pom.xml
	dist/argeo-node/pom.xml
	dist/containers/pom.xml
	dist/osgi-boot/pom.xml
	dist/pom.xml
	org.argeo.api/pom.xml
	org.argeo.cms.e4.rap/pom.xml
	org.argeo.cms.e4/pom.xml
	org.argeo.cms.ui.rap/pom.xml
	org.argeo.cms.ui.theme/pom.xml
	org.argeo.cms.ui/pom.xml
	org.argeo.cms/pom.xml
	org.argeo.core/pom.xml
	org.argeo.eclipse.ui.rap/pom.xml
	org.argeo.eclipse.ui/pom.xml
	org.argeo.enterprise/pom.xml
	org.argeo.jcr/pom.xml
	org.argeo.maintenance/pom.xml
	org.argeo.osgi.boot/pom.xml
	pom.xml
	sdk/pom.xml
---