Merge remote-tracking branch 'origin/unstable' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 27 Feb 2022 08:34:41 +0000 (09:34 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 27 Feb 2022 08:34:41 +0000 (09:34 +0100)
commit6e56ffa34cb02ab04d028423aea342e3dfed4358
tree0a4833a375f84dfa3877f74c963e42bef9f4dacc
parentc285180bece610b2c2921d44fe14b6dde2123efa
parente05973540999712e3c0251774a3f4081f6ffa77c
Merge remote-tracking branch 'origin/unstable' into testing

Conflicts:
cnf/build.bnd
dep/org.argeo.suite.dep.e4.rap/pom.xml
dep/org.argeo.suite.dep.e4.rcp/pom.xml
dep/org.argeo.suite.dep.ui.rap/pom.xml
dep/pom.xml
dist/argeo-suite-standard/pom.xml
dist/pom.xml
lib/pom.xml
org.argeo.entity.api/pom.xml
org.argeo.entity.core/pom.xml
org.argeo.entity.ui/pom.xml
org.argeo.geo.ui/pom.xml
org.argeo.library.ui/pom.xml
org.argeo.people.ui/pom.xml
org.argeo.publishing.ui/pom.xml
org.argeo.suite.core/pom.xml
org.argeo.suite.theme.default/pom.xml
org.argeo.suite.ui.rap/pom.xml
org.argeo.suite.ui/pom.xml
org.argeo.support.geonames/pom.xml
org.argeo.support.odk/pom.xml
org.argeo.support.xforms/pom.xml
pom.xml
.gitmodules
branch.mk
cnf/argeo.bnd
cnf/build.bnd
cnf/maven.bnd
cnf/testing.bnd